From e19627dfdd593ecb21c866383dcb69f7b3d1e757 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sat, 2 Nov 2024 23:15:35 +0000
Subject: [PATCH] Issue #3475916 by spokje, catch, longwave: Bump
phpstan/phpstan to 1.12.4 to make daily "updated deps" QA run pass again
---
composer.json | 2 +-
composer.lock | 12 ++++++------
.../Metapackage/DevDependencies/composer.json | 2 +-
.../PinnedDevDependencies/composer.json | 2 +-
core/.phpstan-baseline.php | 16 ++++++++++++++--
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index fda9e96f527e..a347af94600f 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.11.10",
+ "phpstan/phpstan": "^1.12.4",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
diff --git a/composer.lock b/composer.lock
index dd8d8dceedfd..6460793a8628 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": "ae9d6070e6062edcd58b7c996d5de7b0",
+ "content-hash": "4c9f0780927b5b8741b5a4f4af7abab3",
"packages": [
{
"name": "asm89/stack-cors",
@@ -7101,16 +7101,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.11.10",
+ "version": "1.12.6",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f"
+ "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/640410b32995914bde3eed26fa89552f9c2c082f",
- "reference": "640410b32995914bde3eed26fa89552f9c2c082f",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae",
+ "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae",
"shasum": ""
},
"require": {
@@ -7155,7 +7155,7 @@
"type": "github"
}
],
- "time": "2024-08-08T09:02:50+00:00"
+ "time": "2024-10-06T15:03:59+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 7e8a59bb352d..04e3ca053d5e 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.11.10",
+ "phpstan/phpstan": "^1.12.4",
"phpstan/phpstan-phpunit": "^1.3.16",
"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 2be30180cd0b..bfbc815c24cf 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -49,7 +49,7 @@
"phpspec/prophecy-phpunit": "v2.2.0",
"phpstan/extension-installer": "1.3.1",
"phpstan/phpdoc-parser": "1.29.0",
- "phpstan/phpstan": "1.11.10",
+ "phpstan/phpstan": "1.12.6",
"phpstan/phpstan-deprecation-rules": "1.2.0",
"phpstan/phpstan-phpunit": "1.4.0",
"phpunit/php-code-coverage": "9.2.32",
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 7d0ec835dd24..040cffcdb8ea 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -130,7 +130,7 @@
$ignoreErrors[] = [
// identifier: property.notFound
'message' => '#^Access to an undefined property Drupal\\\\Component\\\\Diff\\\\Engine\\\\DiffEngine\\:\\:\\$xchanged\\.$#',
- 'count' => 6,
+ 'count' => 2,
'path' => __DIR__ . '/lib/Drupal/Component/Diff/Engine/DiffEngine.php',
];
$ignoreErrors[] = [
@@ -148,7 +148,7 @@
$ignoreErrors[] = [
// identifier: property.notFound
'message' => '#^Access to an undefined property Drupal\\\\Component\\\\Diff\\\\Engine\\\\DiffEngine\\:\\:\\$ychanged\\.$#',
- 'count' => 5,
+ 'count' => 2,
'path' => __DIR__ . '/lib/Drupal/Component/Diff/Engine/DiffEngine.php',
];
$ignoreErrors[] = [
@@ -3017,6 +3017,18 @@
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/Tests/Core/Test/AssertContentTraitTest.php',
];
+$ignoreErrors[] = [
+ // identifier: includeOnce.fileNotFound
+ 'message' => '#^Path in include_once\\(\\) "vfs\\://drupal/sites/default/modules/module_a/module_a\\.post_update\\.php" is not a file or it does not exist\\.$#',
+ 'count' => 1,
+ 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php',
+];
+$ignoreErrors[] = [
+ // identifier: includeOnce.fileNotFound
+ 'message' => '#^Path in include_once\\(\\) "vfs\\://drupal/sites/default/modules/module_b/module_b\\.post_update\\.php" is not a file or it does not exist\\.$#',
+ 'count' => 1,
+ 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Update/UpdateRegistryTest.php',
+];
$ignoreErrors[] = [
// identifier: class.implementsDeprecatedInterface
'message' => '#^Class Drupal\\\\Tests\\\\Core\\\\Utility\\\\MockContainerAware implements deprecated interface Symfony\\\\Component\\\\DependencyInjection\\\\ContainerAwareInterface\\:
--
GitLab