Merge branch 'sample-data-composer.json-version' of github.com:fredden/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php

@@ -6,7 +6,6 @@
 
 namespace Magento\SampleData\Console\Command;
 
-use Composer\Console\Application;
 use Composer\Console\ApplicationFactory;
 use Exception;
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -15,12 +14,10 @@
 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;
@@ -32,53 +29,31 @@
  */
 class SampleDataDeployCommand extends Command
 {
-    const OPTION_NO_UPDATE = 'no-update';
+    public const OPTION_NO_UPDATE = 'no-update';
 
-    /**
-     * @var Filesystem
-     */
-    private $filesystem;
+    /** @var Filesystem */
+    private Filesystem $filesystem;
 
-    /**
-     * @var Dependency
-     */
-    private $sampleDataDependency;
+    /** @var Dependency */
+    private Dependency $sampleDataDependency;
 
-    /**
-     * @var ArrayInputFactory
-     * @deprecated 100.1.0
-     */
-    private $arrayInputFactory;
-
-    /**
-     * @var ApplicationFactory
-     */
-    private $applicationFactory;
-
-    /**
-     * @var Json
-     */
-    private $serializer;
+    /** @var ApplicationFactory */
+    private ApplicationFactory $applicationFactory;
 
     /**
      * @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
+        ApplicationFactory $applicationFactory
     ) {
         $this->filesystem = $filesystem;
         $this->sampleDataDependency = $sampleDataDependency;
-        $this->arrayInputFactory = $arrayInputFactory;
         $this->applicationFactory = $applicationFactory;
-        $this->serializer = $serializer;
+
         parent::__construct();
     }
 
@@ -107,35 +82,8 @@ protected function configure()
      * @throws FileSystemException
      * @throws LocalizedException
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $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();
         $sampleDataPackages = $this->sampleDataDependency->getSampleDataPackages();
@@ -153,15 +101,8 @@ function ($package) {
             $arguments = array_merge(['command' => 'require'], $commonArgs);
             $commandInput = new ArrayInput($arguments);
 
-            /** @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(
@@ -173,12 +114,18 @@ function ($package) {
                 return Cli::RETURN_FAILURE;
             }
 
-            return Cli::RETURN_SUCCESS;
-        } else {
-            $output->writeln('<info>' . 'There is no sample data for current set of modules.' . '</info>');
+            $output->writeln(
+                '<info>'
+                . 'Sample data modules have been added via composer. Please run bin/magento setup:upgrade'
+                . '</info>'
+            );
 
-            return Cli::RETURN_FAILURE;
+            return Cli::RETURN_SUCCESS;
         }
+
+        $output->writeln('<info>' . 'There is no sample data for current set of modules.' . '</info>');
+
+        return Cli::RETURN_FAILURE;
     }
 
     /**
@@ -189,7 +136,7 @@ function ($package) {
      * @return void
      * @throws LocalizedException
      */
-    private function createAuthFile()
+    private function createAuthFile(): void
     {
         $directory = $this->filesystem->getDirectoryWrite(DirectoryList::COMPOSER_HOME);
 
@@ -211,7 +158,7 @@ private function createAuthFile()
      * @throws InvalidArgumentException
      * @return void
      */
-    private function updateMemoryLimit()
+    private function updateMemoryLimit(): void
     {
         if (function_exists('ini_set')) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
@@ -244,7 +191,7 @@ private function updateMemoryLimit()
      * @param string $value
      * @return int
      */
-    private function getMemoryInBytes($value)
+    private function getMemoryInBytes(string $value): int
     {
         $unit = strtolower(substr($value, -1, 1));
         $value = (int) $value;

app/code/Magento/SampleData/Test/Unit/Console/Command/AbstractSampleDataCommandTest.php

@@ -26,16 +26,6 @@
  */
 abstract class AbstractSampleDataCommandTest extends TestCase
 {
-    /*
-     * Expected arguments for `composer config` to set missing field "version"
-     */
-    private const STUB_EXPECTED_COMPOSER_CONFIG = [
-        'command' => 'config',
-        'setting-key' => 'version',
-        'setting-value' => ['0.0.1'],
-        '--quiet' => 1
-    ];
-
     /**
      * @var ReadInterface|MockObject
      */
@@ -118,49 +108,21 @@ protected function setupMocks(
             ->willReturn($sampleDataPackages);
         $this->arrayInputFactoryMock->expects($this->never())->method('create');
 
-        if (!array_key_exists('version', $composerJsonContent)) {
-            $this->applicationMock->expects($this->any())
-                ->method('run')
-                ->withConsecutive(
-                    [
-                        'input' => new ArrayInput(
-                            self::STUB_EXPECTED_COMPOSER_CONFIG
+        $this->applicationMock->expects($this->any())
+            ->method('run')
+            ->with(
+                new ArrayInput(
+                    array_merge(
+                        $this->expectedComposerArgumentsSampleDataCommands(
+                            $sampleDataPackages,
+                            $pathToComposerJson
                         ),
-                        'output' => $this->anything()
-                    ],
-                    [
-                        'input' => new ArrayInput(
-                            array_merge(
-                                $this->expectedComposerArgumentsSampleDataCommands(
-                                    $sampleDataPackages,
-                                    $pathToComposerJson
-                                ),
-                                $additionalComposerArgs
-                            )
-                        ),
-                        'output' => $this->anything()
-                    ]
-                )->willReturnOnConsecutiveCalls(
-                    $this->returnValue(0),
-                    $this->returnValue($appRunResult)
-                );
-        } else {
-            $this->applicationMock->expects($this->any())
-                ->method('run')
-                ->with(
-                    new ArrayInput(
-                        array_merge(
-                            $this->expectedComposerArgumentsSampleDataCommands(
-                                $sampleDataPackages,
-                                $pathToComposerJson
-                            ),
-                            $additionalComposerArgs
-                        )
-                    ),
-                    $this->anything()
-                )
-                ->willReturn($appRunResult);
-        }
+                        $additionalComposerArgs
+                    )
+                ),
+                $this->anything()
+            )
+            ->willReturn($appRunResult);
 
         if (($appRunResult !== 0) && !empty($sampleDataPackages)) {
             $this->applicationMock->expects($this->any())