blazy test.module fix (#45)

* Test failure with blazy_test.module

* Ignore the Blazy test module

* Push blazy_test loading to last.

* Try another way to test

* Verify the fix with new tests

* Sorting broke module namespace registration

Author: mglaman

.travis.yml

@@ -8,23 +8,27 @@ before_install:
   - composer global require "hirak/prestissimo:^0.3"
 install:
   - composer install --no-interaction
+  - composer create-project drupal-composer/drupal-project:8.x-dev $TRAVIS_BUILD_DIR/../drupal --no-interaction --no-progress
 script:
   # Inspections
   - ./vendor/bin/phpcs src
   - ./vendor/bin/phpstan analyze src
   - ./vendor/bin/phpunit
 
-  # Try to add to a Drupal setup.
-  - composer create-project drupal-composer/drupal-project:8.x-dev $TRAVIS_BUILD_DIR/../drupal --no-interaction
+  # Install package to a Drupal project. Use repository key 1 to not override Drupal's packagist endpoint.
   - cd $TRAVIS_BUILD_DIR/../drupal
-
-  # Install dependency.
-  - composer config repositories.0 path $TRAVIS_BUILD_DIR
-  - cat composer.json
+  - composer config repositories.1 path $TRAVIS_BUILD_DIR
   - composer require mglaman/phpstan-drupal *@dev
   - cp $TRAVIS_BUILD_DIR/tests/fixtures/drupal-phpstan.neon phpstan.neon
+
+  # Test that a known non-failing file doesn't error out.
   - ./vendor/bin/phpstan analyze web/core/install.php
-  - ./vendor/bin/phpstan analyze web/core/modules/migrate_drupal --no-progress | grep -q "tests/fixtures" && echo 1 || echo 0
+  # Verify test fixtures are ignored.
+  - ./vendor/bin/phpstan analyze web/core/modules/migrate_drupal --no-progress | grep -q "tests/fixtures" && false || true
+
+  # Check "Cannot redeclare token_theme() due to blazy_test.module"
+  - composer require drupal/token drupal/blazy
+  - ./vendor/bin/phpstan analyze web/modules/contrib/blazy --no-progress || if (($? == 255)); then false; else true; fi
 
 cache:
   directories:

src/Drupal/Bootstrap.php

@@ -28,14 +28,14 @@ class Bootstrap
     /**
      * List of available modules.
      *
-     * @var \PHPStan\Drupal\Extension[]
+     * @var Extension[]
      */
     protected $moduleData = [];
 
     /**
      * List of available themes.
      *
-     * @var \PHPStan\Drupal\Extension[]
+     * @var Extension[]
      */
     protected $themeData = [];
 
@@ -69,12 +69,16 @@ public function register(): void
         $this->extensionDiscovery = new ExtensionDiscovery($this->drupalRoot);
         $this->extensionDiscovery->setProfileDirectories([]);
         $profiles = $this->extensionDiscovery->scan('profile');
-        $profile_directories = array_map(function (\PHPStan\Drupal\Extension $profile) : string {
+        $profile_directories = array_map(static function (Extension $profile) : string {
             return $profile->getPath();
         }, $profiles);
         $this->extensionDiscovery->setProfileDirectories($profile_directories);
 
         $this->moduleData = array_merge($this->extensionDiscovery->scan('module'), $profiles);
+        usort($this->moduleData, static function (Extension $a, Extension $b) {
+            // blazy_test causes errors, ensure it is loaded last.
+            return $a->getName() === 'blazy_test' ? 10 : 0;
+        });
         $this->themeData = $this->extensionDiscovery->scan('theme');
 
         $this->loadLegacyIncludes();
@@ -147,7 +151,8 @@ protected function addCoreNamespaces(): void
     }
     protected function addModuleNamespaces(): void
     {
-        foreach ($this->moduleData as $module_name => $module) {
+        foreach ($this->moduleData as $module) {
+            $module_name = $module->getName();
             $module_dir = $this->drupalRoot . '/' . $module->getPath();
             $this->namespaces["Drupal\\$module_name"] = $module_dir . '/src';