Merge pull request #10 from magento-atwix-pyrrans/AC-3208-symfony-upgrade

[Pyrrans] AC-3208: Fixed return types for deploy command

Author: xmav

n98-magerun.yaml

@@ -6,20 +6,24 @@
 
 namespace MagentoHackathon\Composer\Magento\Command;
 
+use Composer\Command\BaseCommand;
 use MagentoHackathon\Composer\Magento\Deploy\Manager\Entry;
 use MagentoHackathon\Composer\Magento\DeployManager;
+use MagentoHackathon\Composer\Magento\Installer;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Composer\Downloader\VcsDownloader;
-use MagentoHackathon\Composer\Magento\Installer;
 
 /**
  * @author Tiago Ribeiro <[email protected]>
  * @author Rui Marinho <[email protected]>
  */
-class DeployCommand extends \Composer\Command\BaseCommand
+class DeployCommand extends BaseCommand
 {
+    private const SUCCESS_EXIT_CODE = 0;
+
+    /**
+     * @inheritdoc
+     */
     protected function configure()
     {
         $this
@@ -28,70 +32,56 @@ protected function configure()
             ->setDefinition([
             // we dont need to define verbose, because composer already defined it internal
             //new InputOption('verbose', 'v', InputOption::VALUE_NONE, 'Show modified files for each directory that contains changes.'),
-        ])
+            ])
             ->setHelp(<<<EOT
 This command deploys all magento Modules
 
 EOT
-        )
-        ;
+        );
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         // init repos
         $composer = $this->getComposer();
         $installedRepo = $composer->getRepositoryManager()->getLocalRepository();
-
-        $dm = $composer->getDownloadManager();
         $im = $composer->getInstallationManager();
 
-        /**
-         * @var $moduleInstaller \MagentoHackathon\Composer\Magento\Installer
-         */
+        /** @var $moduleInstaller Installer */
         $moduleInstaller = $im->getInstaller("magento-module");
-
-
-        $deployManager = new DeployManager( $this->getIO() );
-
-        $extra          = $composer->getPackage()->getExtra();
-        $sortPriority   = $extra['magento-deploy-sort-priority'] ?? [];
+        $deployManager = new DeployManager($this->getIO());
+        $extra = $composer->getPackage()->getExtra();
+        $sortPriority = $extra['magento-deploy-sort-priority'] ?? [];
         $deployManager->setSortPriority( $sortPriority );
-
-
-
         $moduleInstaller->setDeployManager( $deployManager );
-        
 
         foreach ($installedRepo->getPackages() as $package) {
-
             if ($input->getOption('verbose')) {
-                $output->writeln( $package->getName() );
-                $output->writeln( $package->getType() );
+                $output->writeln($package->getName());
+                $output->writeln($package->getType());
             }
-
-            if( $package->getType() != "magento-module" ){
+            if ($package->getType() != "magento-module"){
                 continue;
             }
             if ($input->getOption('verbose')) {
                 $output->writeln("package {$package->getName()} recognized");
             }
-
             $strategy = $moduleInstaller->getDeployStrategy($package);
+
             if ($input->getOption('verbose')) {
                 $output->writeln("used " . get_class($strategy) . " as deploy strategy");
             }
             $strategy->setMappings($moduleInstaller->getParser($package)->getMappings());
-
             $deployManagerEntry = new Entry();
             $deployManagerEntry->setPackageName($package->getName());
             $deployManagerEntry->setDeployStrategy($strategy);
             $deployManager->addPackage($deployManagerEntry);
-            
         }
-
         $deployManager->doDeploy();
 
-        return;
+        return self::SUCCESS_EXIT_CODE;
     }
 }

src/MagentoHackathon/Composer/Magento/Command/DeployCommand.php

@@ -141,7 +141,6 @@ public function getRelativePath($from, $to)
         }
 
         // magento_dir/targetdir/childdir => ../../module_dir/sourcedir/childdir
-        $relativePath = str_repeat('../', count($dir)) . implode('/', $file);
-        return $relativePath;
+        return str_repeat('../', count($dir) - 1) . implode('/', $file);
     }
 }

src/MagentoHackathon/Composer/Magento/Deploystrategy/Symlink.php

@@ -215,8 +215,6 @@ protected function deployLibraries()
             }
             return;
         }
-
-
         $vendorDir = rtrim($this->composer->getConfig()->get('vendor-dir'), '/');
 
         $filesystem = $this->filesystem;
@@ -255,7 +253,8 @@ protected function deployLibraries()
             if ($this->io->isDebug()) {
                 $this->io->write('Magento deployLibraries executes autoload generator');
             }
-            $process = new Process($executable . " -o {$libraryPath}/autoload.php  " . implode(' ', $autoloadDirectories));
+            $command = $executable . " -o {$libraryPath}/autoload.php  " . implode(' ', $autoloadDirectories);
+            $process = method_exists(Process::class, 'fromShellCommandline') ? Process::fromShellCommandline($command) : new Process($command);
             $process->run();
         } else {
             if ($this->io->isDebug()) {
@@ -264,8 +263,6 @@ protected function deployLibraries()
 
             }
         }
-
-
     }
 
 

src/MagentoHackathon/Composer/Magento/Plugin.php

@@ -6,7 +6,8 @@
         }
     ],
     "require": {
-        "magento/magento-composer-installer": "*"
+        "magento/magento-composer-installer": "*",
+        "magento/magento2-base-mock": "*"
     },
     "extra": {
         "magento-root-dir": "root"

src/MagentoHackathon/Composer/Magerun/DeployCommand.php

@@ -48,7 +48,7 @@ public static function setUpBeforeClass(): void
         @unlink(self::getBasePath().'/magento-modules/vendor/theseer/directoryscanner/tests/_data/nested/empty');
 
         $process = Process::fromShellCommandline(
-            self::getComposerCommand().' archive --format=zip --dir="tests/FullStackTest/artifact" -vvv',
+            './' . self::getComposerCommand().' archive --format=zip --dir="tests/FullStackTest/artifact" -vvv',
             self::getProjectRoot()
         );
         $process->run();
@@ -118,7 +118,7 @@ protected static function logProcessOutput(Process $process, $name = null){
             $name . '_Output.log'
         ]);
         if (!is_dir(dirname($logPath))) {
-            mkdir(dirname($logPath));
+            mkdir(dirname($logPath), 0777, true);
         }
         file_put_contents(
             $logPath,
@@ -135,4 +135,4 @@ public function assertProcess(Process $process)
         $message .= PHP_EOL.'Output:'.PHP_EOL.$process->getOutput();
         $this->assertEquals(0, $process->getExitCode(), $message);
     }
-} 
+}

tests/FullStackTest/home/composer.json

@@ -7,7 +7,6 @@
 
 class GlobalPluginTest extends AbstractTest
 {
-    
     protected static $processLogCounter = 1;
 
     protected function setUp(): void
@@ -31,7 +30,7 @@ protected function prepareCleanDirectories()
     public function testGlobalInstall()
     {
         $process = Process::fromShellCommandline(
-            self::getComposerCommand() . ' global install',
+            './' . self::getComposerCommand() . ' global install',
             self::getProjectRoot(),
             ['COMPOSER_HOME' => self::getBasePath() . '/home']
         );
@@ -43,7 +42,7 @@ public function testGlobalInstall()
     public function testGlobalUpdate()
     {
         $process = Process::fromShellCommandline(
-            self::getComposerCommand() . ' global update',
+            './' . self::getComposerCommand() . ' global update',
             self::getProjectRoot(),
             ['COMPOSER_HOME' => self::getBasePath() . '/home']
         );