Skip to content

Commit

Permalink
composerize-drupal scans only modules/contrib not modules folder #25 (#…
Browse files Browse the repository at this point in the history
…26)

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

* Update .travis.yml

* Update .travis.yml
  • Loading branch information
mohammadzo authored and grasmash committed Jun 21, 2019
1 parent 9ef8fc3 commit eb07d4e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ install:
- composer install

script:
- export COMPOSER_PROCESS_TIMEOUT=600
- composer test

after_success:
Expand Down
9 changes: 7 additions & 2 deletions src/Composer/ComposerizeDrupalCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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;
}

Expand Down

0 comments on commit eb07d4e

Please sign in to comment.