Fixed issue #19481: After composer installation sample data can't be installed from command line #27481
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,63 +7,83 @@ | |
| namespace Magento\SampleData\Console\Command; | ||
|
|
||
| use Composer\Console\Application; | ||
| use Composer\Console\ApplicationFactory; | ||
| use Exception; | ||
| use Magento\Framework\App\Filesystem\DirectoryList; | ||
| use Magento\Framework\Console\Cli; | ||
| use Magento\Framework\Exception\FileSystemException; | ||
| use Magento\Framework\Exception\InvalidArgumentException; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| use Magento\Framework\Filesystem; | ||
| use Magento\Framework\Serialize\Serializer\Json; | ||
| use Magento\SampleData\Model\Dependency; | ||
| use Magento\Setup\Model\PackagesAuth; | ||
| use Symfony\Component\Console\Command\Command; | ||
| use Symfony\Component\Console\Input\ArrayInput; | ||
| use Symfony\Component\Console\Input\ArrayInputFactory; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| /** | ||
| * Command for deployment of Sample Data | ||
| * | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| */ | ||
| class SampleDataDeployCommand extends Command | ||
| { | ||
| const OPTION_NO_UPDATE = 'no-update'; | ||
|
|
||
| /** | ||
| * @var Filesystem | ||
| */ | ||
| private $filesystem; | ||
|
|
||
| /** | ||
| * @var Dependency | ||
| */ | ||
| private $sampleDataDependency; | ||
|
|
||
| /** | ||
| * @var ArrayInputFactory | ||
| * @deprecated 100.1.0 | ||
| */ | ||
| private $arrayInputFactory; | ||
|
|
||
| /** | ||
| * @var ApplicationFactory | ||
| */ | ||
| private $applicationFactory; | ||
|
|
||
| /** | ||
| * @var Json | ||
| */ | ||
| private $serializer; | ||
|
|
||
| /** | ||
| * @param Filesystem $filesystem | ||
| * @param Dependency $sampleDataDependency | ||
| * @param ArrayInputFactory $arrayInputFactory | ||
| * @param ApplicationFactory $applicationFactory | ||
| * @param Json $serializer | ||
| */ | ||
| public function __construct( | ||
| Filesystem $filesystem, | ||
| Dependency $sampleDataDependency, | ||
| ArrayInputFactory $arrayInputFactory, | ||
| ApplicationFactory $applicationFactory, | ||
| Json $serializer | ||
| ) { | ||
| $this->filesystem = $filesystem; | ||
| $this->sampleDataDependency = $sampleDataDependency; | ||
| $this->arrayInputFactory = $arrayInputFactory; | ||
| $this->applicationFactory = $applicationFactory; | ||
| $this->serializer = $serializer; | ||
| parent::__construct(); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| protected function configure() | ||
| { | ||
|
|
@@ -79,15 +99,42 @@ protected function configure() | |
| } | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| * | ||
| * @param InputInterface $input | ||
| * @param OutputInterface $output | ||
| * @return int | ||
| * @throws FileSystemException | ||
| * @throws LocalizedException | ||
| */ | ||
| protected function execute(InputInterface $input, OutputInterface $output) | ||
| { | ||
| $rootJson = $this->serializer->unserialize( | ||
| $this->filesystem->getDirectoryRead( | ||
| DirectoryList::ROOT | ||
| )->readFile("composer.json") | ||
| ); | ||
| if (!isset($rootJson['version'])) { | ||
| $magentoProductPackage = array_filter( | ||
| $rootJson['require'], | ||
| function ($package) { | ||
| return false !== strpos($package, 'magento/product-'); | ||
| }, | ||
| ARRAY_FILTER_USE_KEY | ||
| ); | ||
| $version = reset($magentoProductPackage); | ||
| $output->writeln( | ||
| '<info>' . | ||
| // @codingStandardsIgnoreLine | ||
| 'We don\'t recommend to remove the "version" field from your composer.json; see https://getcomposer.org/doc/02-libraries.md#library-versioning for more information.' . | ||
| '</info>' | ||
| ); | ||
| $restoreVersion = new ArrayInput([ | ||
| 'command' => 'config', | ||
| 'setting-key' => 'version', | ||
| 'setting-value' => [$version], | ||
| '--quiet' => 1 | ||
| ]); | ||
| } | ||
| $this->updateMemoryLimit(); | ||
| $this->createAuthFile(); | ||
|
|
@@ -109,16 +156,28 @@ protected function execute(InputInterface $input, OutputInterface $output) | |
| /** @var Application $application */ | ||
| $application = $this->applicationFactory->create(); | ||
| $application->setAutoExit(false); | ||
| if (!empty($restoreVersion)) { | ||
| $result = $application->run($restoreVersion, clone $output); | ||
| if ($result === 0) { | ||
| $output->writeln('<info>The field "version" has been restored.</info>'); | ||
| } | ||
| } | ||
| $result = $application->run($commandInput, $output); | ||
| if ($result !== 0) { | ||
| $output->writeln( | ||
| '<info>' . 'There is an error during sample data deployment. Composer file will be reverted.' | ||
| . '</info>' | ||
| ); | ||
| $application->resetComposer(); | ||
|
|
||
| return Cli::RETURN_FAILURE; | ||
| } | ||
|
|
||
| return Cli::RETURN_SUCCESS; | ||
| } else { | ||
| $output->writeln('<info>' . 'There is no sample data for current set of modules.' . '</info>'); | ||
|
|
||
| return Cli::RETURN_FAILURE; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -128,7 +187,7 @@ protected function execute(InputInterface $input, OutputInterface $output) | |
| * We create auth.json with correct permissions instead of relying on Composer. | ||
| * | ||
| * @return void | ||
| * @throws LocalizedException | ||
| */ | ||
| private function createAuthFile() | ||
| { | ||
|
|
@@ -137,30 +196,51 @@ private function createAuthFile() | |
| if (!$directory->isExist(PackagesAuth::PATH_TO_AUTH_FILE)) { | ||
| try { | ||
| $directory->writeFile(PackagesAuth::PATH_TO_AUTH_FILE, '{}'); | ||
| } catch (Exception $e) { | ||
| throw new LocalizedException(__( | ||
| 'Error in writing Auth file %1. Please check permissions for writing.', | ||
| $directory->getAbsolutePath(PackagesAuth::PATH_TO_AUTH_FILE) | ||
| )); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Updates PHP memory limit | ||
| * | ||
| * @throws InvalidArgumentException | ||
| * @return void | ||
| */ | ||
| private function updateMemoryLimit() | ||
| { | ||
| if (function_exists('ini_set')) { | ||
|
There was a problem hiding this comment. Please use There was a problem hiding this comment. Hello @lenaorobei |
||
| // phpcs:ignore Magento2.Functions.DiscouragedFunction | ||
| $result = ini_set('display_errors', 1); | ||
| if ($result === false) { | ||
| $error = error_get_last(); | ||
| throw new InvalidArgumentException(__( | ||
| 'Failed to set ini option display_errors to value 1. %1', | ||
| $error['message'] | ||
| )); | ||
| } | ||
| $memoryLimit = trim(ini_get('memory_limit')); | ||
| if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) { | ||
| // phpcs:ignore Magento2.Functions.DiscouragedFunction | ||
| $result = ini_set('memory_limit', '756M'); | ||
| if ($result === false) { | ||
| $error = error_get_last(); | ||
| throw new InvalidArgumentException(__( | ||
| 'Failed to set ini option memory_limit to 756M. %1', | ||
| $error['message'] | ||
| )); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves the memory size in bytes | ||
| * | ||
| * @param string $value | ||
| * @return int | ||
| */ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello @lbajsarowicz
I changed
@ini_settoini_alter(that's the alias of ini_set) and added throwing an exception when ini_set returns an error.Please check it.
Thank you in advance.