Fix incompatibility without drupal/core-dev (#246)

* Remove exit code 255 check from no_phpunit job

* drop including bootstrap.php for explicit test namespace registration

* Ignore test paths on no core-dev jobs

* BrowserTestBaseDefaultThemeRule triggers autoloading error when no PHPUnit

* Use fix from #216

Author: mglaman

.github/workflows/php.yml

@@ -156,12 +156,12 @@ jobs:
         run: |
           cd ~/drupal
           COMPOSER_MEMORY_LIMIT=-1 composer require mglaman/phpstan-drupal *@dev
-          cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-phpstan.neon phpstan.neon
+          cp $GITHUB_WORKSPACE/tests/fixtures/config/drupal-no-dev-phpstan.neon phpstan.neon
       - name: "Test core/install.php"
         run: |
           cd ~/drupal
           ./vendor/bin/phpstan analyze web/core/install.php --debug
       - name: "Test no crash"
         run: |
           cd ~/drupal
-          ./vendor/bin/phpstan analyze web/core/modules/dynamic_page_cache --debug || if (($? == 255)); then false; else true; fi
+          ./vendor/bin/phpstan analyze web/core/modules/dynamic_page_cache --debug

src/Drupal/DrupalAutoloader.php

@@ -89,17 +89,12 @@ public function register(Container $container): void
             return strpos($a->getName(), '_test') !== false ? 10 : 0;
         });
         $this->themeData = $extensionDiscovery->scan('theme');
-        $this->addTestNamespaces();
+        $this->addCoreTestNamespaces();
         $this->addModuleNamespaces();
         $this->addThemeNamespaces();
         $this->registerPs4Namespaces($this->namespaces);
         $this->loadLegacyIncludes();
 
-        // @todo stop requiring the bootstrap.php and just copy what is needed.
-        if (interface_exists(\PHPUnit\Framework\Test::class)) {
-            require $this->drupalRoot . '/core/tests/bootstrap.php';
-        }
-
         foreach ($this->moduleData as $extension) {
             $this->loadExtension($extension);
 
@@ -196,6 +191,11 @@ class: Drupal\jsonapi\Routing\JsonApiParamEnhancer
 
         $service_map = $container->getByType(ServiceMap::class);
         $service_map->setDrupalServices($this->serviceMap);
+
+        if (interface_exists(\PHPUnit\Framework\Test::class)
+            && class_exists('Drupal\TestTools\PhpUnitCompatibility\PhpUnit8\ClassWriter')) {
+            \Drupal\TestTools\PhpUnitCompatibility\PhpUnit8\ClassWriter::mutateTestBase($this->autoloader);
+        }
     }
 
     protected function loadLegacyIncludes(): void
@@ -206,7 +206,7 @@ protected function loadLegacyIncludes(): void
         }
     }
 
-    protected function addTestNamespaces(): void
+    protected function addCoreTestNamespaces(): void
     {
         // Add core test namespaces.
         $core_tests_dir = $this->drupalRoot . '/core/tests/Drupal';
@@ -246,13 +246,38 @@ protected function addModuleNamespaces(): void
             $this->serviceClassProviders[$module_name] = $class;
             $serviceId = "service_provider.$module_name.service_provider";
             $this->serviceMap[$serviceId] = ['class' => $class];
+
+            $this->registerExtensionTestNamespace($module);
         }
     }
     protected function addThemeNamespaces(): void
     {
         foreach ($this->themeData as $theme_name => $theme) {
             $theme_dir = $this->drupalRoot . '/' . $theme->getPath();
             $this->namespaces["Drupal\\$theme_name"] = $theme_dir . '/src';
+            $this->registerExtensionTestNamespace($theme);
+        }
+    }
+
+    protected function registerExtensionTestNamespace(Extension $extension): void
+    {
+        $suite_names = ['Unit', 'Kernel', 'Functional', 'Build', 'FunctionalJavascript'];
+        $dir = $this->drupalRoot . '/' . $extension->getPath();
+        $test_dir = $dir . '/tests/src';
+        if (is_dir($test_dir)) {
+            foreach ($suite_names as $suite_name) {
+                $suite_dir = $test_dir . '/' . $suite_name;
+                if (is_dir($suite_dir)) {
+                    // Register the PSR-4 directory for PHPUnit-based suites.
+                    $this->namespaces['Drupal\\Tests\\' . $extension->getName() . '\\' . $suite_name . '\\'][] = $suite_dir;
+                }
+            }
+            // Extensions can have a \Drupal\Tests\extension\Traits namespace for
+            // cross-suite trait code.
+            $trait_dir = $test_dir . '/Traits';
+            if (is_dir($trait_dir)) {
+                $this->namespaces['Drupal\\Tests\\' . $extension->getName() . '\\Traits\\'][] = $trait_dir;
+            }
         }
     }
 

src/Rules/Drupal/Tests/BrowserTestBaseDefaultThemeRule.php

@@ -19,7 +19,6 @@ public function getNodeType(): string
     public function processNode(Node $node, Scope $scope): array
     {
         if (!interface_exists(\PHPUnit\Framework\Test::class)) {
-            // PHPUnit is unavailable in the class loader.
             return [];
         }
         assert($node instanceof Node\Stmt\Class_);

tests/fixtures/config/drupal-no-dev-phpstan.neon

@@ -0,0 +1,9 @@
+parameters:
+	reportUnmatchedIgnoredErrors: false
+	level: 0
+	ignoreErrors:
+		- '#\Drupal calls should be avoided in classes, use dependency injection instead#'
+	excludePaths:
+		-  */tests/src/*/*.php
+includes:
+	- vendor/mglaman/phpstan-drupal/extension.neon