From ce2e1aa2351c2e9ccdc0c8431de0e24dca2b3da5 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Sat, 7 Oct 2023 15:58:43 +0100
Subject: [PATCH] Issue #3392313 by Spokje: Bump phpstan/phpstan to latest to
make daily "updated deps" QA run pass again
---
composer.json | 2 +-
composer.lock | 12 ++++++------
composer/Metapackage/DevDependencies/composer.json | 2 +-
.../Metapackage/PinnedDevDependencies/composer.json | 2 +-
core/phpstan-baseline.neon | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index 3a4d96eff814..e551ea3eafc2 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.24",
+ "phpstan/phpstan": "^1.10.38",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.3",
diff --git a/composer.lock b/composer.lock
index f1ed6e611c19..37afa35eb3e9 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": "a30c52b5963c822aaa101826b97c7bab",
+ "content-hash": "1f03bd567e9e6a240f6bec2e76b7f448",
"packages": [
{
"name": "asm89/stack-cors",
@@ -6828,16 +6828,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.24",
+ "version": "1.10.38",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "360ecc90569e9a60c2954ee209ec04fa0d958e14"
+ "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/360ecc90569e9a60c2954ee209ec04fa0d958e14",
- "reference": "360ecc90569e9a60c2954ee209ec04fa0d958e14",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691",
+ "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691",
"shasum": ""
},
"require": {
@@ -6886,7 +6886,7 @@
"type": "tidelift"
}
],
- "time": "2023-07-05T12:32:13+00:00"
+ "time": "2023-10-06T14:19:14+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index 44b215805d66..0dae0f6f6013 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.24",
+ "phpstan/phpstan": "^1.10.38",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.3",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index cf05e4691c31..051e7fc22b4b 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -49,7 +49,7 @@
"phpspec/prophecy-phpunit": "v2.0.2",
"phpstan/extension-installer": "1.3.1",
"phpstan/phpdoc-parser": "1.20.4",
- "phpstan/phpstan": "1.10.24",
+ "phpstan/phpstan": "1.10.38",
"phpstan/phpstan-deprecation-rules": "1.1.4",
"phpstan/phpstan-phpunit": "1.3.13",
"phpunit/php-code-coverage": "9.2.26",
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index 6fb89a4d5afe..eaebe0791f5d 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -119,7 +119,7 @@ parameters:
-
message: "#^Access to an undefined property Drupal\\\\Component\\\\Diff\\\\Engine\\\\DiffEngine\\:\\:\\$xchanged\\.$#"
- count: 2
+ count: 6
path: lib/Drupal/Component/Diff/Engine/DiffEngine.php
-
@@ -134,7 +134,7 @@ parameters:
-
message: "#^Access to an undefined property Drupal\\\\Component\\\\Diff\\\\Engine\\\\DiffEngine\\:\\:\\$ychanged\\.$#"
- count: 2
+ count: 5
path: lib/Drupal/Component/Diff/Engine/DiffEngine.php
-
--
GitLab