Skip to content

PHPStan configuration update to fix ModuleHandler->loadInclude() (v2) #6122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 13.x
Choose a base branch
from
Open

PHPStan configuration update to fix ModuleHandler->loadInclude() (v2) #6122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ecd06c
Remove drupal_root as it is no longer necessary
andyg5000 Sep 27, 2024
5a46ce3
Add required phpstan-drupal rules to fix include loading (#6120)
andyg5000 Sep 27, 2024
5cc2b40
PHPStan fixes
weitzman Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 3 additions & 5 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@ 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
- Drupal\views\ViewExecutable
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#'
Expand All @@ -28,3 +23,6 @@ parameters:
includes:
- vendor/mglaman/phpstan-drupal/extension.neon
- phpstan-baseline.neon

rules:
- mglaman\PHPStanDrupal\Rules\Drupal\LoadIncludes
2 changes: 1 addition & 1 deletion src/Commands/core/LanguageCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
]));
}
Expand Down
1 change: 1 addition & 0 deletions src/Commands/core/LocaleCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down