composerize-drupal scans only modules/contrib not modules folder #25 (#…

…26) * composerize-drupal scans only modules/contrib not modules folder #25 * Update .travis.yml * Update .travis.yml
grasmash · Jun 21, 2019 · eb07d4e · eb07d4e
1 parent 9ef8fc3
commit eb07d4e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,7 @@ install:
   - composer install
 
 script:
+  - export COMPOSER_PROCESS_TIMEOUT=600
   - composer test
 
 after_success:

diff --git a/src/Composer/ComposerizeDrupalCommand.php b/src/Composer/ComposerizeDrupalCommand.php
@@ -351,11 +351,16 @@ protected function printPostScript()
      */
     protected function findContribProjects($root_composer_json)
     {
-        $modules = DrupalInspector::findContribProjects(
+        $modules_contrib = DrupalInspector::findContribProjects(
             $this->drupalRoot,
             "modules/contrib",
             $root_composer_json
         );
+        $modules = DrupalInspector::findContribProjects(
+            $this->drupalRoot,
+            "modules",
+            $root_composer_json
+        );
         $themes = DrupalInspector::findContribProjects(
             $this->drupalRoot,
             "themes/contrib",
@@ -366,7 +371,7 @@ protected function findContribProjects($root_composer_json)
             "profiles/contrib",
             $root_composer_json
         );
-        $projects = array_merge($modules, $themes, $profiles);
+        $projects = array_merge($modules_contrib, $modules, $themes, $profiles);
         return $projects;
     }