From b01f7e30740984668a70367e32187d9ca4f135a1 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 16 Mar 2024 17:38:55 +0000
Subject: [PATCH] Issue #3428052 by Spokje, mondrake: Bump phpstan/phpstan and
mglaman/phpstan-drupal to latest
---
composer.json | 2 +-
composer.lock | 53 +++++++++----------
.../Metapackage/CoreRecommended/composer.json | 4 +-
.../Metapackage/DevDependencies/composer.json | 2 +-
.../PinnedDevDependencies/composer.json | 4 +-
core/.phpstan-baseline.php | 14 ++++-
core/lib/Drupal/Component/Diff/composer.json | 2 +-
7 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/composer.json b/composer.json
index 671f2875d99d..1c0c3c45b8ac 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
"php-http/guzzle7-adapter": "^1.0",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.10.47",
+ "phpstan/phpstan": "^1.10.62",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
diff --git a/composer.lock b/composer.lock
index 5b5f39617770..484ef36f391d 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": "50678d888725975acfa1fb438696b593",
+ "content-hash": "ac0aabafd36d9d9dd8469c44109f73cd",
"packages": [
{
"name": "asm89/stack-cors",
@@ -2891,16 +2891,16 @@
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.28.0",
+ "version": "v1.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+ "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
- "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+ "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
"shasum": ""
},
"require": {
@@ -2914,9 +2914,6 @@
},
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "1.28-dev"
- },
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
@@ -2953,7 +2950,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
},
"funding": [
{
@@ -2969,7 +2966,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-26T09:26:14+00:00"
+ "time": "2024-01-29T20:11:03+00:00"
},
{
"name": "symfony/polyfill-iconv",
@@ -4298,16 +4295,16 @@
},
{
"name": "symfony/yaml",
- "version": "v6.4.0",
+ "version": "v6.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587"
+ "reference": "d75715985f0f94f978e3a8fa42533e10db921b90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/4f9237a1bb42455d609e6687d2613dde5b41a587",
- "reference": "4f9237a1bb42455d609e6687d2613dde5b41a587",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90",
+ "reference": "d75715985f0f94f978e3a8fa42533e10db921b90",
"shasum": ""
},
"require": {
@@ -4350,7 +4347,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/yaml/tree/v6.4.0"
+ "source": "https://github.com/symfony/yaml/tree/v6.4.3"
},
"funding": [
{
@@ -4366,7 +4363,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-06T11:00:25+00:00"
+ "time": "2024-01-23T14:51:35+00:00"
},
{
"name": "twig/twig",
@@ -5637,21 +5634,21 @@
},
{
"name": "mglaman/phpstan-drupal",
- "version": "1.2.4",
+ "version": "1.2.7",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
- "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6"
+ "reference": "32f79fcf48c74532014248687ae3850581a22416"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6",
- "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6",
+ "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/32f79fcf48c74532014248687ae3850581a22416",
+ "reference": "32f79fcf48c74532014248687ae3850581a22416",
"shasum": ""
},
"require": {
"php": "^7.4 || ^8.0",
- "phpstan/phpstan": "^1.10.1",
+ "phpstan/phpstan": "^1.10.56",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
"symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0",
@@ -5721,7 +5718,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.2.4"
+ "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.7"
},
"funding": [
{
@@ -5737,7 +5734,7 @@
"type": "tidelift"
}
],
- "time": "2023-11-14T22:47:32+00:00"
+ "time": "2024-02-14T04:38:08+00:00"
},
{
"name": "micheh/phpcs-gitlab",
@@ -7091,16 +7088,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.48",
+ "version": "1.10.62",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6"
+ "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6",
- "reference": "087ed4b5f4a7a6e8f3bbdfbfe98ce5c181380bc6",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9",
+ "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9",
"shasum": ""
},
"require": {
@@ -7149,7 +7146,7 @@
"type": "tidelift"
}
],
- "time": "2023-12-08T14:34:28+00:00"
+ "time": "2024-03-13T12:27:20+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
diff --git a/composer/Metapackage/CoreRecommended/composer.json b/composer/Metapackage/CoreRecommended/composer.json
index 9c7df65c6d59..1979056e3f2a 100644
--- a/composer/Metapackage/CoreRecommended/composer.json
+++ b/composer/Metapackage/CoreRecommended/composer.json
@@ -43,7 +43,7 @@
"symfony/http-kernel": "~v6.4.1",
"symfony/mailer": "~v6.4.0",
"symfony/mime": "~v6.4.0",
- "symfony/polyfill-ctype": "~v1.28.0",
+ "symfony/polyfill-ctype": "~v1.29.0",
"symfony/polyfill-iconv": "~v1.28.0",
"symfony/polyfill-intl-grapheme": "~v1.28.0",
"symfony/polyfill-intl-idn": "~v1.28.0",
@@ -60,7 +60,7 @@
"symfony/validator": "~v6.4.0",
"symfony/var-dumper": "~v6.4.0",
"symfony/var-exporter": "~v6.4.1",
- "symfony/yaml": "~v6.4.0",
+ "symfony/yaml": "~v6.4.3",
"twig/twig": "~v3.8.0"
}
}
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 7a5931134873..a4ac872af886 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -23,7 +23,7 @@
"php-http/guzzle7-adapter": "^1.0",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.10.47",
+ "phpstan/phpstan": "^1.10.62",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 94a2c8a5a16c..c97a80544acf 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -25,7 +25,7 @@
"justinrainbow/json-schema": "v5.2.13",
"lullabot/mink-selenium2-driver": "v1.7.2",
"lullabot/php-webdriver": "v2.0.3",
- "mglaman/phpstan-drupal": "1.2.4",
+ "mglaman/phpstan-drupal": "1.2.7",
"micheh/phpcs-gitlab": "1.1.0",
"mikey179/vfsstream": "v1.6.11",
"myclabs/deep-copy": "1.11.1",
@@ -49,7 +49,7 @@
"phpspec/prophecy-phpunit": "v2.1.0",
"phpstan/extension-installer": "1.3.1",
"phpstan/phpdoc-parser": "1.24.4",
- "phpstan/phpstan": "1.10.48",
+ "phpstan/phpstan": "1.10.62",
"phpstan/phpstan-deprecation-rules": "1.1.4",
"phpstan/phpstan-phpunit": "1.3.15",
"phpunit/php-code-coverage": "9.2.29",
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 6d67b03c2e38..5b0e6bbe3261 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -427,6 +427,11 @@
'count' => 1,
'path' => __DIR__ . '/lib/Drupal/Core/Form/FormBuilder.php',
];
+$ignoreErrors[] = [
+ 'message' => '#^Variable \\$input in isset\\(\\) always exists and is not nullable\\.$#',
+ 'count' => 1,
+ 'path' => __DIR__ . '/lib/Drupal/Core/Form/FormBuilder.php',
+];
$ignoreErrors[] = [
'message' => '#^Variable \\$form in isset\\(\\) always exists and is not nullable\\.$#',
'count' => 1,
@@ -546,6 +551,11 @@
'count' => 1,
'path' => __DIR__ . '/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php',
];
+$ignoreErrors[] = [
+ 'message' => '#^Variable \\$elements in isset\\(\\) always exists and is not nullable\\.$#',
+ 'count' => 1,
+ 'path' => __DIR__ . '/lib/Drupal/Core/Render/Renderer.php',
+];
$ignoreErrors[] = [
'message' => '#^Variable \\$transaction in isset\\(\\) always exists and is not nullable\\.$#',
'count' => 1,
@@ -1187,7 +1197,7 @@
'path' => __DIR__ . '/modules/migrate/src/Plugin/migrate/destination/NullDestination.php',
];
$ignoreErrors[] = [
- 'message' => '#^Call to an undefined static method static\\(Drupal\\\\Tests\\\\migrate\\\\Kernel\\\\MigrateTestBase\\)\\:\\:migrateDumpAlter\\(\\)\\.$#',
+ 'message' => '#^Call to an undefined static method Drupal\\\\Tests\\\\migrate\\\\Kernel\\\\MigrateTestBase\\:\\:migrateDumpAlter\\(\\)\\.$#',
'count' => 1,
'path' => __DIR__ . '/modules/migrate/tests/src/Kernel/MigrateTestBase.php',
];
@@ -1767,7 +1777,7 @@
];
$ignoreErrors[] = [
'message' => '#^Variable \\$validate_types might not be defined\\.$#',
- 'count' => 2,
+ 'count' => 1,
'path' => __DIR__ . '/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php',
];
$ignoreErrors[] = [
diff --git a/core/lib/Drupal/Component/Diff/composer.json b/core/lib/Drupal/Component/Diff/composer.json
index 7410e7afbdef..57a07592ff85 100644
--- a/core/lib/Drupal/Component/Diff/composer.json
+++ b/core/lib/Drupal/Component/Diff/composer.json
@@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
- "sebastian/diff": "^4 | ^5"
+ "sebastian/diff": "^4"
},
"autoload": {
"psr-4": {
--
GitLab