Merge pull request #101 from wunderio/hotfix/99-fix-php_stan-error-wi…

…th-DrupalAutoloader #99 Fix PHP Stan error with DrupalAutoloader.
wunderio · May 21, 2024 · 05aeaca · 05aeaca
2 parents 9c84619 + c7a9908
commit 05aeaca
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -44,7 +44,8 @@
         "dealerdirect/phpcodesniffer-composer-installer": "*",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0"
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "webflo/drupal-finder": "^1.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Drupal/DrupalAutoloader.php b/src/Drupal/DrupalAutoloader.php
@@ -5,7 +5,7 @@
 namespace Wunderio\GrumPHP\Drupal;
 
 use Drupal\Core\DependencyInjection\ContainerNotInitializedException;
-use DrupalFinder\DrupalFinder;
+use DrupalFinder\DrupalFinderComposerRuntime;
 use Drush\Drush;
 use mglaman\PHPStanDrupal\Drupal\Extension;
 use mglaman\PHPStanDrupal\Drupal\ExtensionDiscovery;
@@ -90,8 +90,7 @@ class DrupalAutoloader {
    *   Path to Drupal root.
    */
   public function register(string $drupalRoot): void {
-    $finder = new DrupalFinder();
-    $finder->locateRoot($drupalRoot);
+    $finder = new DrupalFinderComposerRuntime();
 
     $drupalRoot = $finder->getDrupalRoot();
     $drupalVendorRoot = $finder->getVendorDir();

diff --git a/src/Task/Psalm/services.yaml b/src/Task/Psalm/services.yaml
@@ -0,0 +1,8 @@
+services:
+   Wunderio\GrumPHP\Task\Psalm\PsalmTask:
+    class: Wunderio\GrumPHP\Task\Psalm\PsalmTask
+    arguments:
+      - '@process_builder'
+      - '@formatter.raw_process'
+    tags:
+      - {name: grumphp.task, task: psalm}