diff --git a/composer.json b/composer.json
index 40cf1337dbecebc5355e1f83702b95b5bf5bae23..4b9d3e873f05a4feb8aca2db3c710960ae4ed1e8 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
"phpunit/phpunit": "^9.5",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan": "^1.8.5",
"symfony/css-selector": "^6.1",
"symfony/phpunit-bridge": "^6.1.2",
"symfony/var-dumper": "^6.1",
@@ -38,9 +38,6 @@
"symfony/browser-kit": "^6.1",
"symfony/dom-crawler": "^6.1"
},
- "conflict": {
- "phpstan/phpstan": "1.8.3"
- },
"replace": {
"symfony/polyfill-php72": "*",
"symfony/polyfill-php73": "*"
diff --git a/composer.lock b/composer.lock
index af4bb04532938038cffdcc7e3fec4d05d2811d39..c79b6cfdfa09c61ea4332e956258adcd4d710fa0 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": "51cd1f4d1509625e924134edd7084442",
+ "content-hash": "848ed40dde8a1366251b621b4b9930d5",
"packages": [
{
"name": "asm89/stack-cors",
@@ -5855,16 +5855,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.8.2",
+ "version": "1.8.5",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
+ "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
- "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
+ "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
"shasum": ""
},
"require": {
@@ -5888,9 +5888,13 @@
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
+ "keywords": [
+ "dev",
+ "static analysis"
+ ],
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
+ "source": "https://github.com/phpstan/phpstan/tree/1.8.5"
},
"funding": [
{
@@ -5901,16 +5905,12 @@
"url": "https://github.com/phpstan",
"type": "github"
},
- {
- "url": "https://www.patreon.com/phpstan",
- "type": "patreon"
- },
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
- "time": "2022-07-20T09:57:31+00:00"
+ "time": "2022-09-07T16:05:32+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 262149e9afb8ea118b57a75310f1c5389761376d..2f715682a262e3c834f5c56b32a74deb2ccaf7fe 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -18,7 +18,7 @@
"mikey179/vfsstream": "^1.6.11",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.8",
+ "phpstan/phpstan": "^1.8.5",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.1",
"symfony/css-selector": "^6.1",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 72882e87e678e47875ec60268fccfa77db7f9b27..733b3e3c781fc2bde06f66149ffe71fcc521980f 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -36,7 +36,7 @@
"phpspec/prophecy-phpunit": "v2.0.1",
"phpstan/extension-installer": "1.1.0",
"phpstan/phpdoc-parser": "1.7.0",
- "phpstan/phpstan": "1.8.2",
+ "phpstan/phpstan": "1.8.5",
"phpunit/php-code-coverage": "9.2.17",
"phpunit/php-file-iterator": "3.0.6",
"phpunit/php-invoker": "3.1.1",
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index af5940ce5928ed5e47e1cddc5988e738cb257289..87187cfdee2d242ea5c1fe0341618ab9272179aa 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -1,10 +1,5 @@
parameters:
ignoreErrors:
- -
- message: "#^Function format_size\\(\\) should return Drupal\\\\Core\\\\StringTranslation\\\\TranslatableMarkup but return statement is missing\\.$#"
- count: 1
- path: includes/common.inc
-
-
message: "#^Function install_config_download_translations\\(\\) should return string but return statement is missing\\.$#"
count: 1
@@ -475,11 +470,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Menu/MenuLinkManager.php
- -
- message: "#^Cannot unset offset 'options' on array\\{url\\: string\\|null\\}\\.$#"
- count: 1
- path: lib/Drupal/Core/Render/Element/RenderElement.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
@@ -585,16 +575,6 @@ parameters:
count: 1
path: lib/Drupal/Core/Updater/Updater.php
- -
- message: "#^Cannot unset offset 'href' on array\\{type\\: 'button'\\}\\.$#"
- count: 1
- path: lib/Drupal/Core/Utility/LinkGenerator.php
-
- -
- message: "#^Cannot unset offset 'hreflang' on array\\{type\\: 'button'\\}\\.$#"
- count: 1
- path: lib/Drupal/Core/Utility/LinkGenerator.php
-
-
message: "#^Access to an undefined property Drupal\\\\Core\\\\Validation\\\\ConstraintValidatorFactory\\:\\:\\$classResolver\\.$#"
count: 2
@@ -1156,15 +1136,7 @@ parameters:
path: modules/migrate/tests/src/Kernel/MigrateTestBase.php
-
- message: """
- #^Cannot unset offset 'menu_ui' on array\\{system\\: 'finished\\:
- 6\\:
- …', menu_link_content\\: 'finished\\:
- 6\\:
- …', menu\\: 'finished\\:
- 6\\:
- …'\\}\\.$#
- """
+ message: "#^Cannot unset offset 'menu_ui' on array\\{system\\: \"finished\\:\\\\n 6\\:\\\\n …\", menu_link_content\\: \"finished\\:\\\\n 6\\:\\\\n …\", menu\\: \"finished\\:\\\\n 6\\:\\\\n …\"\\}\\.$#"
count: 1
path: modules/migrate_drupal/tests/src/Unit/MigrationStateUnitTest.php
@@ -1848,6 +1820,16 @@ parameters:
count: 2
path: modules/views/tests/src/Kernel/RenderCacheIntegrationTest.php
+ -
+ message: "#^Cannot unset offset mixed on array\\.$#"
+ count: 1
+ path: modules/views/views.theme.inc
+
+ -
+ message: "#^Cannot unset offset '\\#title' on array\\{\\#theme_wrappers\\: array\\{'container'\\}, \\#attributes\\: array\\{class\\: array\\{'scroll'\\}, data\\-drupal\\-views\\-scroll\\: true\\}\\}\\.$#"
+ count: 1
+ path: modules/views_ui/src/Form/Ajax/Display.php
+
-
message: "#^Method Drupal\\\\views_ui\\\\ViewEditForm\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1