From 5062db5e6529f247dbc7e39b076bb1f54a457109 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Thu, 25 May 2023 12:29:42 +0100
Subject: [PATCH] Issue #3362569 by Spokje: Update mglaman/phpstan-drupal and
make daily "updated deps" QA jobs pass
---
composer.json | 2 +-
composer.lock | 14 +++++++-------
composer/Metapackage/DevDependencies/composer.json | 2 +-
.../PinnedDevDependencies/composer.json | 2 +-
core/phpstan-baseline.neon | 5 -----
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/composer.json b/composer.json
index a64233f27ef0..20649054bdb1 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"drupal/coder": "^8.3.10",
"instaclick/php-webdriver": "^1.4.1",
"justinrainbow/json-schema": "^5.2",
- "mglaman/phpstan-drupal": "^1.1.33",
+ "mglaman/phpstan-drupal": "^1.1.34",
"mikey179/vfsstream": "^1.6.11",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
diff --git a/composer.lock b/composer.lock
index d3c32ce7501b..aff0834f52e4 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": "e4d4d8e10e78088fb06171c7df50acbe",
+ "content-hash": "9799dd30df5c95a15f9095b15a32b927",
"packages": [
{
"name": "asm89/stack-cors",
@@ -5382,16 +5382,16 @@
},
{
"name": "mglaman/phpstan-drupal",
- "version": "1.1.33",
+ "version": "1.1.34",
"source": {
"type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git",
- "reference": "42d594e70ea0e6b75662d35f302814558e05ac2e"
+ "reference": "1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/42d594e70ea0e6b75662d35f302814558e05ac2e",
- "reference": "42d594e70ea0e6b75662d35f302814558e05ac2e",
+ "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c",
+ "reference": "1422ca153874935bb4f8efd98b0b3b2e8aa7cb0c",
"shasum": ""
},
"require": {
@@ -5466,7 +5466,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.1.33"
+ "source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.34"
},
"funding": [
{
@@ -5482,7 +5482,7 @@
"type": "tidelift"
}
],
- "time": "2023-05-17T21:43:58+00:00"
+ "time": "2023-05-24T21:12:15+00:00"
},
{
"name": "mikey179/vfsstream",
diff --git a/composer/Metapackage/DevDependencies/composer.json b/composer/Metapackage/DevDependencies/composer.json
index ea7c89edf781..e096b911ace1 100644
--- a/composer/Metapackage/DevDependencies/composer.json
+++ b/composer/Metapackage/DevDependencies/composer.json
@@ -15,7 +15,7 @@
"drupal/coder": "^8.3.10",
"instaclick/php-webdriver": "^1.4.1",
"justinrainbow/json-schema": "^5.2",
- "mglaman/phpstan-drupal": "^1.1.33",
+ "mglaman/phpstan-drupal": "^1.1.34",
"mikey179/vfsstream": "^1.6.11",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 43523a067466..eeef7dde5e95 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -24,7 +24,7 @@
"drupal/coder": "8.3.18",
"instaclick/php-webdriver": "1.4.16",
"justinrainbow/json-schema": "5.2.12",
- "mglaman/phpstan-drupal": "1.1.33",
+ "mglaman/phpstan-drupal": "1.1.34",
"mikey179/vfsstream": "v1.6.11",
"myclabs/deep-copy": "1.11.1",
"nikic/php-parser": "v4.15.4",
diff --git a/core/phpstan-baseline.neon b/core/phpstan-baseline.neon
index cda4d2f0ebb6..9ea58324f48c 100644
--- a/core/phpstan-baseline.neon
+++ b/core/phpstan-baseline.neon
@@ -800,11 +800,6 @@ parameters:
count: 3
path: modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php
- -
- message: "#^Variable \\$book_links in empty\\(\\) is never defined\\.$#"
- count: 1
- path: modules/book/book.module
-
-
message: "#^Variable \\$callable in empty\\(\\) always exists and is not falsy\\.$#"
count: 1
--
GitLab