From d4342d701461a14ca790bf79cbb0c14a89e49165 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Fri, 9 Aug 2024 22:29:22 +0900
Subject: [PATCH] Issue #3467098 by Spokje: Bump phpstan/phpstan and
mglaman/phpstan-drupal to latest to make daily "updated deps" QA run pass
again
---
composer.json | 4 +--
composer.lock | 26 +++++++++----------
.../Metapackage/DevDependencies/composer.json | 4 +--
.../PinnedDevDependencies/composer.json | 4 +--
core/.phpstan-baseline.php | 21 ---------------
core/tests/PHPStan/composer.json | 2 +-
6 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/composer.json b/composer.json
index 0989029af185..471b12d516ab 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"justinrainbow/json-schema": "^5.2",
"lullabot/mink-selenium2-driver": "^1.7.3",
"lullabot/php-webdriver": "^2.0.5",
- "mglaman/phpstan-drupal": "^1.2.10",
+ "mglaman/phpstan-drupal": "^1.2.11",
"micheh/phpcs-gitlab": "^1.1",
"mikey179/vfsstream": "^1.6.11",
"open-telemetry/exporter-otlp": "^1",
@@ -31,7 +31,7 @@
"php-http/guzzle7-adapter": "^1.0",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.11.8",
+ "phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^10.5.19",
"symfony/browser-kit": "^7.1",
diff --git a/composer.lock b/composer.lock
index c975a845130a..1a9b87e9d7cd 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": "0f1d1a247b1cc704077dcea4f3268b44",
+ "content-hash": "ec40abd5ff391df832bf4f2c214f3820",
"packages": [
{
"name": "asm89/stack-cors",
@@ -5545,20 +5545,20 @@
},
{
"name": "mglaman/phpstan-drupal",
- "version": "1.2.11",
+ "version": "1.2.12",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
- "reference": "e624a4b64de5b91a0c56852635af2115e9a6e08c"
+ "reference": "346bdddda169a56b6ebb7dc17893f0ac8f33a4f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/e624a4b64de5b91a0c56852635af2115e9a6e08c",
- "reference": "e624a4b64de5b91a0c56852635af2115e9a6e08c",
+ "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/346bdddda169a56b6ebb7dc17893f0ac8f33a4f1",
+ "reference": "346bdddda169a56b6ebb7dc17893f0ac8f33a4f1",
"shasum": ""
},
"require": {
- "php": "^7.4 || ^8.0",
+ "php": "^8.1",
"phpstan/phpstan": "^1.10.56",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
@@ -5629,7 +5629,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.11"
+ "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.12"
},
"funding": [
{
@@ -5645,7 +5645,7 @@
"type": "tidelift"
}
],
- "time": "2024-05-10T17:22:10+00:00"
+ "time": "2024-08-07T21:15:21+00:00"
},
{
"name": "micheh/phpcs-gitlab",
@@ -7020,16 +7020,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.11.9",
+ "version": "1.11.10",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e370bcddadaede0c1716338b262346f40d296f82"
+ "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e370bcddadaede0c1716338b262346f40d296f82",
- "reference": "e370bcddadaede0c1716338b262346f40d296f82",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
+ "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
"shasum": ""
},
"require": {
@@ -7074,7 +7074,7 @@
"type": "github"
}
],
- "time": "2024-08-01T16:25:18+00:00"
+ "time": "2024-08-08T09:02:50+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 972a50e8200f..0e8bb97b11d4 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -15,7 +15,7 @@
"justinrainbow/json-schema": "^5.2",
"lullabot/mink-selenium2-driver": "^1.7.3",
"lullabot/php-webdriver": "^2.0.5",
- "mglaman/phpstan-drupal": "^1.2.10",
+ "mglaman/phpstan-drupal": "^1.2.11",
"micheh/phpcs-gitlab": "^1.1",
"mikey179/vfsstream": "^1.6.11",
"open-telemetry/exporter-otlp": "^1",
@@ -23,7 +23,7 @@
"php-http/guzzle7-adapter": "^1.0",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.11.8",
+ "phpstan/phpstan": "^1.11.10",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^10.5.19",
"symfony/browser-kit": "^7.1",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 4872a97d9f03..077cad0dcf37 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -25,7 +25,7 @@
"justinrainbow/json-schema": "5.3.0",
"lullabot/mink-selenium2-driver": "v1.7.3",
"lullabot/php-webdriver": "v2.0.5",
- "mglaman/phpstan-drupal": "1.2.11",
+ "mglaman/phpstan-drupal": "1.2.12",
"micheh/phpcs-gitlab": "1.1.0",
"mikey179/vfsstream": "v1.6.11",
"myclabs/deep-copy": "1.12.0",
@@ -49,7 +49,7 @@
"phpspec/prophecy-phpunit": "v2.2.0",
"phpstan/extension-installer": "1.4.1",
"phpstan/phpdoc-parser": "1.29.1",
- "phpstan/phpstan": "1.11.9",
+ "phpstan/phpstan": "1.11.10",
"phpstan/phpstan-deprecation-rules": "1.2.0",
"phpstan/phpstan-phpunit": "1.4.0",
"phpunit/php-code-coverage": "10.1.15",
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 6b0f8073d600..5e09c6be4767 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -838,12 +838,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php',
];
-$ignoreErrors[] = [
- // identifier: property.notFound
- 'message' => '#^Access to an undefined property Drupal\\\\datetime\\\\Plugin\\\\Field\\\\FieldType\\\\DateTimeItem\\:\\:\\$date\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php',
-];
$ignoreErrors[] = [
// identifier: isset.variable
'message' => '#^Variable \\$item in isset\\(\\) always exists and is not nullable\\.$#',
@@ -2361,21 +2355,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php',
];
-$ignoreErrors[] = [
- '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' => __DIR__ . '/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigExistingSettingsTest.php',
-];
-$ignoreErrors[] = [
- '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' => __DIR__ . '/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigNoSystemSiteTest.php',
-];
-$ignoreErrors[] = [
- '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' => __DIR__ . '/tests/Drupal/FunctionalTests/Installer/InstallerExistingConfigTest.php',
-];
$ignoreErrors[] = [
// identifier: variable.undefined
'message' => '#^Variable \\$found might not be defined\\.$#',
diff --git a/core/tests/PHPStan/composer.json b/core/tests/PHPStan/composer.json
index cfab7371f37e..33031d9ee79a 100644
--- a/core/tests/PHPStan/composer.json
+++ b/core/tests/PHPStan/composer.json
@@ -3,7 +3,7 @@
"description": "Tests Drupal core's PHPStan rules",
"require-dev": {
"phpunit/phpunit": "^10",
- "phpstan/phpstan": "1.11.9"
+ "phpstan/phpstan": "1.11.10"
},
"license": "GPL-2.0-or-later",
"autoload": {
--
GitLab