Fix autoloading of PhpunitCompatibilityTrait (#145)

* Adjust autoloading

* Verify  phpstan/phpstan:0.12.40 works

* Verify  phpstan/phpstan:0.12.42 works

Author: mglaman

composer.json

@@ -38,6 +38,9 @@
     "autoload-dev": {
         "classmap": ["tests/src"]
     },
+    "conflict": {
+        "phpstan/phpstan": "^0.12.43"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.12-dev"

src/Drupal/DrupalAutoloader.php

@@ -95,7 +95,7 @@ public function register(Container $container): void
             return $a->getName() === 'blazy_test' ? 10 : 0;
         });
         $this->themeData = $this->extensionDiscovery->scan('theme');
-        $this->addCoreNamespaces();
+        $this->addTestNamespaces();
         $this->addModuleNamespaces();
         $this->addThemeNamespaces();
         $this->registerPs4Namespaces($this->namespaces);
@@ -209,28 +209,18 @@ protected function loadLegacyIncludes(): void
         }
     }
 
-    protected function addCoreNamespaces(): void
+    protected function addTestNamespaces(): void
     {
-        foreach (['Core', 'Component'] as $parent_directory) {
-            $path = $this->drupalRoot . '/core/lib/Drupal/' . $parent_directory;
-            $parent_namespace = 'Drupal\\' . $parent_directory;
-            foreach (new \DirectoryIterator($path) as $component) {
-                if (!$component->isDot() && $component->isDir()) {
-                    $this->namespaces[$parent_namespace . '\\' . $component->getFilename()] = $path . '/' . $component->getFilename();
-                }
-            }
-        }
-
         // Add core test namespaces.
         $core_tests_dir = $this->drupalRoot . '/core/tests/Drupal';
+        $this->namespaces['Drupal\\BuildTests'] = $core_tests_dir . '/BuildTests';
+        $this->namespaces['Drupal\\FunctionalJavascriptTests'] = $core_tests_dir . '/FunctionalJavascriptTests';
+        $this->namespaces['Drupal\\FunctionalTests'] =  $core_tests_dir . '/FunctionalTests';
+        $this->namespaces['Drupal\\KernelTests'] = $core_tests_dir . '/KernelTests';
         $this->namespaces['Drupal\\Tests'] = $core_tests_dir . '/Tests';
         $this->namespaces['Drupal\\TestSite'] = $core_tests_dir . '/TestSite';
-        $this->namespaces['Drupal\\KernelTests'] = $core_tests_dir . '/KernelTests';
-        $this->namespaces['Drupal\\FunctionalTests'] =  $core_tests_dir . '/FunctionalTests';
-        $this->namespaces['Drupal\\FunctionalJavascriptTests'] = $core_tests_dir . '/FunctionalJavascriptTests';
-        $this->namespaces['Drupal\\Tests\\TestSuites'] = $this->drupalRoot . '/core/tests/TestSuites';
-        $this->namespaces['Drupal\\BuildTests'] = $core_tests_dir . '/BuildTests';
         $this->namespaces['Drupal\\TestTools'] = $core_tests_dir . '/TestTools';
+        $this->namespaces['Drupal\\Tests\\TestSuites'] = $this->drupalRoot . '/core/tests/TestSuites';
     }
 
     protected function addModuleNamespaces(): void

tests/src/DrupalIntegrationTest.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Drupal;
 
+use PHPStan\Analyser\Error;
+
 final class DrupalIntegrationTest extends AnalyzerTestBase {
 
     public function testInstallPhp() {
@@ -52,16 +54,17 @@ public function testExtensionReportsError() {
 
     public function testExtensionTestSuiteAutoloading()
     {
-        $this->markTestSkipped('Causing a ridiculous amount of memory usage.');
         $paths = [
             __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/Unit/ModuleWithTestsTest.php',
             __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/Traits/ModuleWithTestsTrait.php',
             __DIR__ . '/../fixtures/drupal/modules/module_with_tests/tests/src/TestSite/ModuleWithTestsTestSite.php',
         ];
         foreach ($paths as $path) {
             $errors = $this->runAnalyze($path);
-            $this->assertCount(0, $errors->getErrors(), print_r($errors, true));
-            $this->assertCount(0, $errors->getInternalErrors(), print_r($errors, true));
+            $this->assertCount(0, $errors->getErrors(), implode(PHP_EOL, array_map(static function (Error $error) {
+                return $error->getMessage();
+            }, $errors->getErrors())));
+            $this->assertCount(0, $errors->getInternalErrors(), implode(PHP_EOL, $errors->getInternalErrors()));
         }
     }