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/phpstan.neon.dist b/phpstan.neon.dist index c9a8ba60d2..27802a8249 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 @@ -14,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#' @@ -28,3 +23,6 @@ parameters: includes: - vendor/mglaman/phpstan-drupal/extension.neon - phpstan-baseline.neon + +rules: + - mglaman\PHPStanDrupal\Rules\Drupal\LoadIncludes 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; }