From 0ecd06ce0c15b06ae7f95e5e4489295304727784 Mon Sep 17 00:00:00 2001
From: Andyg5000 <andyg5000@gmail.com>
Date: Fri, 27 Sep 2024 12:48:33 +0000
Subject: [PATCH 1/3] Remove drupal_root as it is no longer necessary

---
 phpstan.neon.dist | 2 --
 1 file changed, 2 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c9a8ba60d2..7129084f51 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -5,8 +5,6 @@ parameters:
         - phpstan-bootstrap.php
     paths:
         - src
-    drupal:
-        drupal_root: %currentWorkingDirectory%/sut
     universalObjectCratesClasses:
         # Useful until we have https://www.drupal.org/project/drupal/issues/2024043
         - Drupal\Core\Extension\Extension

From 5a46ce3720b620db30362bc5b5f7e7270936e585 Mon Sep 17 00:00:00 2001
From: Andyg5000 <andyg5000@gmail.com>
Date: Fri, 27 Sep 2024 12:51:29 +0000
Subject: [PATCH 2/3] Add required phpstan-drupal rules to fix include loading
 (#6120)

---
 phpstan.neon.dist | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 7129084f51..27802a8249 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -12,9 +12,6 @@ parameters:
     excludePaths:
         # Deliberately calls optional external code.
         - src/Psysh/Caster.php
-        # Remove once https://github.com/mglaman/phpstan-drupal/issues/741 is resolved
-        - src/Commands/core/LocaleCommands.php
-        - src/Commands/core/LanguageCommands.php
     ignoreErrors:
         # XHprof
         - '#tideways_xhprof_enable#'
@@ -26,3 +23,6 @@ parameters:
 includes:
     - vendor/mglaman/phpstan-drupal/extension.neon
     - phpstan-baseline.neon
+
+rules:
+    - mglaman\PHPStanDrupal\Rules\Drupal\LoadIncludes

From 5cc2b409da7f2e25bb8b7cd4c28595ac40ac2475 Mon Sep 17 00:00:00 2001
From: Moshe Weitzman <weitzman@tejasa.com>
Date: Sat, 28 Sep 2024 07:03:59 -0400
Subject: [PATCH 3/3] PHPStan fixes

---
 composer.json                          | 2 +-
 src/Commands/core/LanguageCommands.php | 2 +-
 src/Commands/core/LocaleCommands.php   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5b7f35516c..af15a2c160 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,7 @@
     "drupal/core-recommended": "^10.2.5 || 11.0.x-dev",
     "drupal/semver_example": "2.3.0",
     "jetbrains/phpstorm-attributes": "^1.0",
-    "mglaman/phpstan-drupal": "^1.2",
+    "mglaman/phpstan-drupal": "^1.3.1",
     "phpunit/phpunit": "^9 || ^10",
     "rector/rector": "^1",
     "squizlabs/php_codesniffer": "^3.7"
diff --git a/src/Commands/core/LanguageCommands.php b/src/Commands/core/LanguageCommands.php
index 451096b09e..d3e8f3cbb0 100644
--- a/src/Commands/core/LanguageCommands.php
+++ b/src/Commands/core/LanguageCommands.php
@@ -58,7 +58,7 @@ public function add($langcode, $options = ['skip-translations' => false]): void
                 $language = ConfigurableLanguage::createFromLangcode($langcode);
                 $language->save();
 
-                $this->logger->success(dt('Added language @language', [
+                $this->logger()->success(dt('Added language @language', [
                     '@language' => $language->label(),
                 ]));
             }
diff --git a/src/Commands/core/LocaleCommands.php b/src/Commands/core/LocaleCommands.php
index 337358033f..9cbc2d7250 100644
--- a/src/Commands/core/LocaleCommands.php
+++ b/src/Commands/core/LocaleCommands.php
@@ -485,6 +485,7 @@ private function writePoFile(string $file_uri, ?LanguageInterface $language = nu
         }
 
         $reader_item = $reader->readItem();
+        // @phpstan-ignore-next-line
         if (empty($reader_item)) {
             return false;
         }