From 7de259e74d2e1d50f3aa2cbf18f57b6af30e85be Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 18 Mar 2024 10:19:15 +0000
Subject: [PATCH] Issue #3431227 by Spokje, longwave: Update
phpstan/phpstan-phpunit and make the updated-deps CI job pass again
---
composer.json | 2 +-
composer.lock | 14 +++++++-------
.../Metapackage/DevDependencies/composer.json | 2 +-
.../PinnedDevDependencies/composer.json | 2 +-
core/.phpstan-baseline.php | 15 +++++----------
5 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/composer.json b/composer.json
index 1c0c3c45b8ac..e676386da3df 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.10.62",
- "phpstan/phpstan-phpunit": "^1.3.11",
+ "phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
"symfony/css-selector": "^6.4",
diff --git a/composer.lock b/composer.lock
index 3b946253cc9f..74d95e19bb0f 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": "ac0aabafd36d9d9dd8469c44109f73cd",
+ "content-hash": "479da193f70d9ec14eb448a2d7360a05",
"packages": [
{
"name": "asm89/stack-cors",
@@ -7199,16 +7199,16 @@
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.15",
+ "version": "1.3.16",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
+ "reference": "d5242a59d035e46774f2e634b374bc39ff62cb95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/d5242a59d035e46774f2e634b374bc39ff62cb95",
+ "reference": "d5242a59d035e46774f2e634b374bc39ff62cb95",
"shasum": ""
},
"require": {
@@ -7245,9 +7245,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.15"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.16"
},
- "time": "2023-10-09T18:58:39+00:00"
+ "time": "2024-02-23T09:51:20+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index a4ac872af886..727217eef9c6 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -24,7 +24,7 @@
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.10.62",
- "phpstan/phpstan-phpunit": "^1.3.11",
+ "phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
"symfony/css-selector": "^6.4",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index c97a80544acf..755744e6652c 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -51,7 +51,7 @@
"phpstan/phpdoc-parser": "1.24.4",
"phpstan/phpstan": "1.10.62",
"phpstan/phpstan-deprecation-rules": "1.1.4",
- "phpstan/phpstan-phpunit": "1.3.15",
+ "phpstan/phpstan-phpunit": "1.3.16",
"phpunit/php-code-coverage": "9.2.29",
"phpunit/php-file-iterator": "3.0.6",
"phpunit/php-invoker": "3.1.1",
diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php
index 5b0e6bbe3261..8503a727d9f8 100644
--- a/core/.phpstan-baseline.php
+++ b/core/.phpstan-baseline.php
@@ -1593,6 +1593,11 @@
'count' => 3,
'path' => __DIR__ . '/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php',
];
+$ignoreErrors[] = [
+ 'message' => '#^Variable \\$test_meta in empty\\(\\) always exists and is not falsy\\.$#',
+ 'count' => 2,
+ 'path' => __DIR__ . '/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php',
+];
$ignoreErrors[] = [
'message' => '#^Variable \\$expected_required_list_items might not be defined\\.$#',
'count' => 2,
@@ -1633,11 +1638,6 @@
'count' => 1,
'path' => __DIR__ . '/modules/taxonomy/src/VocabularyForm.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Variable \\$depth_count might not be defined\\.$#',
- 'count' => 4,
- 'path' => __DIR__ . '/modules/taxonomy/tests/src/Kernel/TermKernelTest.php',
-];
$ignoreErrors[] = [
'message' => '#^Method Drupal\\\\tour\\\\TipPluginBase\\:\\:get\\(\\) should return string but return statement is missing\\.$#',
'count' => 1,
@@ -2152,11 +2152,6 @@
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php',
];
-$ignoreErrors[] = [
- 'message' => '#^Variable \\$entity might not be defined\\.$#',
- 'count' => 1,
- 'path' => __DIR__ . '/tests/Drupal/KernelTests/Core/Entity/FieldableEntityDefinitionUpdateTest.php',
-];
$ignoreErrors[] = [
'message' => '#^Variable \\$new_field_schema_data might not be defined\\.$#',
'count' => 1,
--
GitLab