diff --git a/composer.json b/composer.json index d641469a763..d84e91a2291 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "composer/composer": "^2.3.5", "drupal/coder": "^8.3.10", "instaclick/php-webdriver": "^1.4.1", - "mglaman/phpstan-drupal": "^1.1.21", + "mglaman/phpstan-drupal": "^1.1.25", "mikey179/vfsstream": "^1.6.8", "phpunit/phpunit": "^9.5", "phpspec/prophecy-phpunit": "^2", diff --git a/composer.lock b/composer.lock index c39550fce05..1dde09853b2 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "52ee090aa2c068a39b76ecc45ed1a0f2", + "content-hash": "55d89b3964e0ccd0b6243419d50fecc5", "packages": [ { "name": "asm89/stack-cors", @@ -5061,16 +5061,16 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.1.21", + "version": "1.1.25", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "8acaa1e4a15b266cfbd404c6fcb4e1be398f05f8" + "reference": "480245d5d0bd1858e01c43d738718dab85be0ad2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/8acaa1e4a15b266cfbd404c6fcb4e1be398f05f8", - "reference": "8acaa1e4a15b266cfbd404c6fcb4e1be398f05f8", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/480245d5d0bd1858e01c43d738718dab85be0ad2", + "reference": "480245d5d0bd1858e01c43d738718dab85be0ad2", "shasum": "" }, "require": { @@ -5145,7 +5145,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.21" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.25" }, "funding": [ { @@ -5161,7 +5161,7 @@ "type": "tidelift" } ], - "time": "2022-07-07T19:39:04+00:00" + "time": "2022-07-18T17:17:55+00:00" }, { "name": "mikey179/vfsstream", diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json index 05bc29a225c..9c27b382c0e 100644 --- a/composer/Metapackage/DevDependencies/composer.json +++ b/composer/Metapackage/DevDependencies/composer.json @@ -15,7 +15,7 @@ "easyrdf/easyrdf": "^1.0", "instaclick/php-webdriver": "^1.4.1", "justinrainbow/json-schema": "^5.2", - "mglaman/phpstan-drupal": "^1.1.21", + "mglaman/phpstan-drupal": "^1.1.25", "mikey179/vfsstream": "^1.6.8", "phpspec/prophecy-phpunit": "^2", "phpstan/extension-installer": "^1.1", diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json index 10c5b2f35cb..137380ad59a 100644 --- a/composer/Metapackage/PinnedDevDependencies/composer.json +++ b/composer/Metapackage/PinnedDevDependencies/composer.json @@ -23,7 +23,7 @@ "easyrdf/easyrdf": "1.1.1", "instaclick/php-webdriver": "1.4.14", "justinrainbow/json-schema": "5.2.12", - "mglaman/phpstan-drupal": "1.1.21", + "mglaman/phpstan-drupal": "1.1.25", "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 797a382f0e4..50c770ed621 100644 --- a/core/phpstan-baseline.neon +++ b/core/phpstan-baseline.neon @@ -485,11 +485,6 @@ parameters: count: 1 path: lib/Drupal/Core/Menu/MenuLinkManager.php - - - message: "#^\\#pre_render value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 1 - path: lib/Drupal/Core/Render/Element/Pager.php - - message: "#^Cannot unset offset 'options' on array\\{url\\: string\\|null\\}\\.$#" count: 1 @@ -625,11 +620,6 @@ parameters: count: 1 path: modules/ban/src/Plugin/migrate/destination/BlockedIp.php - - - message: "#^\\#lazy_builder value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 1 - path: modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php - - message: "#^\\#lazy_builder callback 'hello_or_yarhar' at key '0' is not callable\\.$#" count: 1 @@ -640,21 +630,6 @@ parameters: count: 1 path: modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php - - - message: "#^\\#lazy_builder value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 3 - path: modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php - - - - message: "#^\\#lazy_builder value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 1 - path: modules/block/src/BlockViewBuilder.php - - - - message: "#^\\#pre_render value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 1 - path: modules/block/src/BlockViewBuilder.php - - message: "#^Access to an undefined property Drupal\\\\block\\\\Plugin\\\\migrate\\\\process\\\\BlockTheme\\:\\:\\$themes\\.$#" count: 1 @@ -990,11 +965,6 @@ parameters: count: 2 path: modules/file/tests/src/Kernel/UsageTest.php - - - message: "#^\\#lazy_builder value 'string' at key '0' is invalid\\.$#" - count: 1 - path: modules/filter/src/FilterProcessResult.php - - message: "#^Access to an undefined property Drupal\\\\filter\\\\Plugin\\\\migrate\\\\process\\\\d6\\\\FilterFormatPermission\\:\\:\\$migration\\.$#" count: 1 @@ -1283,11 +1253,6 @@ parameters: count: 1 path: modules/node/src/NodeTypeForm.php - - - message: "#^\\#lazy_builder value 'non\\-empty\\-string' at key '0' is invalid\\.$#" - count: 1 - path: modules/node/src/NodeViewBuilder.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: 1 @@ -2194,7 +2159,7 @@ parameters: path: tests/Drupal/Tests/Core/Render/RendererCallbackTest.php - - message: "#^\\#post_render callback class 'Drupal\\\\Tests\\\\Core\\\\Render\\\\RendererCallbackTest' at key '0' does not implement Drupal\\\\Core\\\\Security\\\\TrustedCallbackInterface\\.$#" + message: "#^\\#post_render callback class 'static\\(Drupal\\\\Tests\\\\Core\\\\Render\\\\RendererCallbackTest\\)' at key '0' does not implement Drupal\\\\Core\\\\Security\\\\TrustedCallbackInterface\\.$#" count: 1 path: tests/Drupal/Tests/Core/Render/RendererCallbackTest.php @@ -2208,11 +2173,6 @@ parameters: count: 1 path: tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php - - - message: "#^\\#access_callback value ''Drupal\\\\\\\\Tests\\\\\\\\Core…'\\|'Drupal\\\\\\\\Tests\\\\\\\\Core…'\\|'Drupal\\\\\\\\Tests\\\\\\\\Core…'\\|'Drupal\\\\\\\\Tests\\\\\\\\Core…'' at key '0' is invalid\\.$#" - count: 1 - path: tests/Drupal/Tests/Core/Render/RendererTest.php - - message: "#^Call to an undefined method Drupal\\\\Tests\\\\Core\\\\Test\\\\TestClass\\:\\:assertArrayHasKey\\(\\)\\.$#" count: 3