MCLOUD-5665: Improve git installation add support for packages with different structure (magento#708)

Author: oshmyheliuk

src/Command/Dev/UpdateComposer/ComposerGenerator.php

@@ -18,6 +18,11 @@ class ComposerGenerator
 {
     const REPO_TYPE_SINGLE_PACKAGE = 'single-package';
 
+    /**
+     * Type for packages with modules in the root directory such as Inventory
+     */
+    const REPO_TYPE_FLAT_STRUCTURE = 'flat-structure';
+
     /**
      * @var DirectoryList
      */
@@ -128,7 +133,7 @@ private function getBaseComposer(array $repoOptions): array
         $preparePackagesScripts = [];
 
         foreach ($repoOptions as $repoName => $gitOption) {
-            if ($this->isSinglePackage($gitOption)) {
+            if ($this->isSinglePackage($gitOption) || $this->isFlatStructurePackage($gitOption)) {
                 continue;
             }
 
@@ -204,51 +209,68 @@ private function getBaseComposer(array $repoOptions): array
      * @param array $composer
      * @return array
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function addModules(array $repoOptions, array $composer): array
     {
-        $add = function ($dir, $version = null) use (&$composer) {
-            if (!$this->file->isExists($dir . '/composer.json')) {
-                return 0;
-            }
-
-            $dirComposer = json_decode($this->file->fileGetContents($dir . '/composer.json'), true);
-            $composer['repositories'][$dirComposer['name']] = [
-                'type' => 'path',
-                'url' => ltrim(str_replace($this->directoryList->getMagentoRoot(), '', $dir), '/'),
-                'options' => [
-                    'symlink' => false,
-                ],
-            ];
-            $composer['require'][$dirComposer['name']] = $version ?? $dirComposer['version'] ?? '*';
-        };
-
         foreach ($repoOptions as $repoName => $gitOption) {
             $baseRepoFolder = $this->directoryList->getMagentoRoot() . '/' . $repoName;
             if ($this->isSinglePackage($gitOption)) {
-                $add($baseRepoFolder, '*');
+                $this->addModule($baseRepoFolder, $composer, '*');
+                continue;
+            }
+
+            if ($this->isFlatStructurePackage($gitOption)) {
+                foreach (glob($baseRepoFolder . '/*') as $dir) {
+                    $this->addModule($dir, $composer);
+                }
                 continue;
             }
 
             foreach (glob($baseRepoFolder . '/app/code/Magento/*') as $dir) {
-                $add($dir);
+                $this->addModule($dir, $composer);
             }
             foreach (glob($baseRepoFolder . '/app/design/*/Magento/*/') as $dir) {
-                $add($dir);
+                $this->addModule($dir, $composer);
             }
             foreach (glob($baseRepoFolder . '/app/design/*/Magento/*/') as $dir) {
-                $add($dir);
+                $this->addModule($dir, $composer);
             }
             if ($this->file->isDirectory($baseRepoFolder . '/lib/internal/Magento/Framework/')) {
                 foreach (glob($baseRepoFolder . '/lib/internal/Magento/Framework/*') as $dir) {
-                    $add($dir);
+                    $this->addModule($dir, $composer);
                 }
             }
         }
 
         return $composer;
     }
 
+    /**
+     * Add single module to composer json
+     *
+     * @param string $dir
+     * @param array $composer
+     * @param string|null $version
+     * @throws \Magento\MagentoCloud\Filesystem\FileSystemException
+     */
+    private function addModule(string $dir, array &$composer, string $version = null): void
+    {
+        if (!$this->file->isExists($dir . '/composer.json')) {
+            return;
+        }
+
+        $dirComposer = json_decode($this->file->fileGetContents($dir . '/composer.json'), true);
+        $composer['repositories'][$dirComposer['name']] = [
+            'type' => 'path',
+            'url' => ltrim(str_replace($this->directoryList->getMagentoRoot(), '', $dir), '/'),
+            'options' => [
+                'symlink' => false,
+            ],
+        ];
+        $composer['require'][$dirComposer['name']] = $version ?? $dirComposer['version'] ?? '*';
+    }
+
     /**
      * @param array $repoOptions
      * @return bool
@@ -257,4 +279,15 @@ private function isSinglePackage(array $repoOptions): bool
     {
         return isset($repoOptions['type']) && $repoOptions['type'] == self::REPO_TYPE_SINGLE_PACKAGE;
     }
+
+    /**
+     * Checks that package has option type and it equal to @see ComposerGenerator::REPO_TYPE_FLAT_STRUCTURE
+     *
+     * @param array $repoOptions
+     * @return bool
+     */
+    private function isFlatStructurePackage(array $repoOptions): bool
+    {
+        return isset($repoOptions['type']) && $repoOptions['type'] == self::REPO_TYPE_FLAT_STRUCTURE;
+    }
 }

src/Test/Unit/Command/Dev/UpdateComposer/ComposerGeneratorTest.php

@@ -36,6 +36,11 @@ class ComposerGeneratorTest extends TestCase
             'branch' => '3.0.0',
             'type' => 'single-package'
         ],
+        'repo4' => [
+            'repo' => 'path_to_repo4',
+            'branch' => '1.1.0',
+            'type' => 'flat-structure'
+        ]
     ];
 
     /**
@@ -88,9 +93,9 @@ public function testGenerate()
         $this->magentoVersionMock->expects($this->once())
             ->method('getVersion')
             ->willReturn('2.2');
-        $this->fileMock->expects($this->exactly(5))
+        $this->fileMock->expects($this->exactly(6))
             ->method('isExists')
-            ->willReturn(true);
+            ->willReturn(true, true, true, true, false, true);
         $this->fileMock->expects($this->exactly(5))
             ->method('fileGetContents')
             ->willReturnOnConsecutiveCalls(
@@ -147,10 +152,11 @@ private function assertInstallFromGitScripts(array $actual)
         $this->assertEquals(
             [
                 'php -r"@mkdir(__DIR__ . \'/app/etc\', 0777, true);"',
-                'rm -rf repo1 repo2 repo3',
+                'rm -rf repo1 repo2 repo3 repo4',
                 'git clone -b 1.0.0 --single-branch --depth 1 path_to_repo1 repo1',
                 'git clone -b 1.0.0 --single-branch --depth 1 path_to_repo2 repo2',
                 'git clone -b 3.0.0 --single-branch --depth 1 path_to_repo3 repo3',
+                'git clone -b 1.1.0 --single-branch --depth 1 path_to_repo4 repo4',
             ],
             $actual
         );