diff --git a/composer.lock b/composer.lock
index 7c7176bc9746c0666ba25f396ffd3c8aa6a5eac6..666dfe192b154544b3b3c91d51e7d6e0650e1f76 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5173,16 +5173,16 @@
},
{
"name": "mglaman/phpstan-drupal",
- "version": "1.1.9",
+ "version": "1.1.16",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
- "reference": "74b356d990906fa0dd423544ef0d1b48cd52a246"
+ "reference": "2c72ac675e5630e1f421adb1bf4e6546310d6b05"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/74b356d990906fa0dd423544ef0d1b48cd52a246",
- "reference": "74b356d990906fa0dd423544ef0d1b48cd52a246",
+ "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/2c72ac675e5630e1f421adb1bf4e6546310d6b05",
+ "reference": "2c72ac675e5630e1f421adb1bf4e6546310d6b05",
"shasum": ""
},
"require": {
@@ -5193,15 +5193,17 @@
"webflo/drupal-finder": "^1.2"
},
"require-dev": {
+ "behat/mink": "^1.8",
"composer/installers": "^1.9",
- "drupal/core-dev": "^8.8@alpha || ^9.0",
"drupal/core-recommended": "^8.8@alpha || ^9.0",
"drush/drush": "^9.6 || ^10.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9",
- "squizlabs/php_codesniffer": "^3.3"
+ "slevomat/coding-standard": "^7.1",
+ "squizlabs/php_codesniffer": "^3.3",
+ "symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0"
},
"suggest": {
"jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.",
@@ -5232,7 +5234,8 @@
},
"phpstan": {
"includes": [
- "extension.neon"
+ "extension.neon",
+ "rules.neon"
]
}
},
@@ -5257,7 +5260,7 @@
"description": "Drupal extension and rules for PHPStan",
"support": {
"issues": "https://github.com/mglaman/phpstan-drupal/issues",
- "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.9"
+ "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.16"
},
"funding": [
{
@@ -5273,7 +5276,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-17T15:57:58+00:00"
+ "time": "2022-04-13T20:19:23+00:00"
},
{
"name": "mikey179/vfsstream",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 174e67473bfad822af6a9835fc93a35744d772e5..4d02d0bfdf320ba9ad6a14bf5b47c30d6138a733 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -22,7 +22,7 @@
"easyrdf/easyrdf": "1.1.1",
"instaclick/php-webdriver": "1.4.14",
"justinrainbow/json-schema": "5.2.12",
- "mglaman/phpstan-drupal": "1.1.9",
+ "mglaman/phpstan-drupal": "1.1.16",
"mikey179/vfsstream": "v1.6.10",
"myclabs/deep-copy": "1.11.0",
"nikic/php-parser": "v4.13.2",
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index f28da256832a673e25bd62e94036c4af83d263c7..21857781ae5aefc3690dece12c92f27431f80f1a 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -545,16 +545,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Render/Element/RenderElement.php
- -
- message: "#^The \"\\#lazy_builder\" expects a callable array with arguments\\.$#"
- count: 1
- path: lib/Drupal/Core/Render/PlaceholderGenerator.php
-
- -
- message: "#^The \"\\#lazy_builder\" expects a callable array with arguments\\.$#"
- count: 1
- path: lib/Drupal/Core/Render/Renderer.php
-
-
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:10\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 2
@@ -575,11 +565,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Template/AttributeValueBase.php
- -
- message: "#^Function twig_escape_filter not found\\.$#"
- count: 1
- path: lib/Drupal/Core/Template/TwigExtension.php
-
-
message: "#^Access to an undefined property Drupal\\\\Core\\\\Template\\\\TwigNodeVisitor\\:\\:\\$skipRenderVarFunction\\.$#"
count: 1
@@ -735,11 +720,6 @@ parameters:
count: 1
path: modules/block/tests/src/Functional/Rest/BlockResourceTestBase.php
- -
- message: "#^Cannot unset offset string on array\\<int, string\\>\\.$#"
- count: 1
- path: modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
-
-
message: "#^Method Drupal\\\\block_content\\\\BlockContentForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1
@@ -2378,16 +2358,6 @@ parameters:
count: 1
path: modules/pgsql/src/Driver/Database/pgsql/Upsert.php
- -
- message: "#^Drupal\\\\Tests\\\\BrowserTestBase\\:\\:\\$defaultTheme is required\\. See https\\://www\\.drupal\\.org/node/3083055, which includes recommendations on which theme to use\\.$#"
- count: 1
- path: modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php
-
- -
- message: "#^Call to an undefined method Drupal\\\\Tests\\\\quickedit\\\\FunctionalJavascript\\\\SettingsTrayIntegrationTest\\:\\:randomName\\(\\)\\.$#"
- count: 1
- path: modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
-
-
message: "#^Method Drupal\\\\Tests\\\\rdf\\\\Functional\\\\Rest\\\\RdfMappingResourceTestBase\\:\\:getNormalizedPostEntity\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -3673,16 +3643,6 @@ parameters:
count: 1
path: tests/Drupal/FunctionalJavascriptTests/Ajax/FormValuesTest.php
- -
- message: "#^Drupal\\\\Tests\\\\BrowserTestBase\\:\\:\\$defaultTheme is required\\. See https\\://www\\.drupal\\.org/node/3083055, which includes recommendations on which theme to use\\.$#"
- count: 1
- path: tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoSystemSiteTest.php
-
- -
- message: "#^Drupal\\\\Tests\\\\BrowserTestBase\\:\\:\\$defaultTheme is required\\. See https\\://www\\.drupal\\.org/node/3083055, which includes recommendations on which theme to use\\.$#"
- count: 1
- path: tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTest.php
-
-
message: "#^Method Drupal\\\\FunctionalTests\\\\Rest\\\\BaseFieldOverrideResourceTestBase\\:\\:getNormalizedPostEntity\\(\\) should return array but return statement is missing\\.$#"
count: 1
@@ -4093,11 +4053,6 @@ parameters:
count: 1
path: tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
- -
- message: "#^The \"\\#lazy_builder\" expects a callable array with arguments\\.$#"
- count: 1
- path: tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
-
-
message: "#^\\#access_callback value 'literal\\-string&non\\-empty\\-string' at key '0' is invalid\\.$#"
count: 1
diff --git a/core/phpstan.neon.dist b/core/phpstan.neon.dist
index f31d8d11555a9ea6bc893a6f011f2ce36e7e2f00..543c5d50ef830cb0704480257a958d9a6b843db0 100644
--- a/core/phpstan.neon.dist
+++ b/core/phpstan.neon.dist
@@ -36,3 +36,7 @@ parameters:
- "#^Missing cache backend declaration for performance.#"
- "#cache tag might be unclear and does not contain the cache key in it.#"
- "#^Class .* extends @internal class#"
+
+ # This check was ignored on purpose until the issues with it, which started in version 1.1.15, are solved.
+ # @see https://www.drupal.org/node/3280328
+ - "#^Missing explicit access check on entity query.#"