Issue #3341254 by Spokje, longwave: Fix failing "updated deps" test-runs on 10.x.x (843e0a80) · Commits · project / drupal

composer.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,11 +22,11 @@
		"drupal/coder": "^8.3.10",
		"instaclick/php-webdriver": "^1.4.1",
		"justinrainbow/json-schema": "^5.2",
		"mglaman/phpstan-drupal": "^1.1.27",
		"mglaman/phpstan-drupal": "^1.1.29",
		"mikey179/vfsstream": "^1.6.11",
		"phpspec/prophecy-phpunit": "^2",
		"phpstan/extension-installer": "^1.1",
		"phpstan/phpstan": "^1.9.9",
		"phpstan/phpstan": "^1.10.1",
		"phpunit/phpunit": "^9.5",
		"symfony/browser-kit": "^6.2",
		"symfony/css-selector": "^6.2",

composer.lock

+13 −13

Original line number	Diff line number	Diff line
		@@ -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": "325f7170ea2137245a2bbcc5e2de9011",
		"content-hash": "31ed43e991e91dae14239ba7578c8320",
		"packages": [
		{
		"name": "asm89/stack-cors",
		@@ -5106,16 +5106,16 @@
		},
		{
		"name": "mglaman/phpstan-drupal",
		"version": "1.1.27",
		"version": "1.1.29",
		"source": {
		"type": "git",
		"url": "https://github.com/mglaman/phpstan-drupal.git",
		"reference": "61daa574664fa138f42dc7e883de9a12a7703462"
		"reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/61daa574664fa138f42dc7e883de9a12a7703462",
		"reference": "61daa574664fa138f42dc7e883de9a12a7703462",
		"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/e6f6191c53b159013fcbd186d7f85511f3f96ff8",
		"reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8",
		"shasum": ""
		},
		"require": {
		@@ -5190,7 +5190,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.27"
		"source": "https://github.com/mglaman/phpstan-drupal/tree/1.1.29"
		},
		"funding": [
		{
		@@ -5206,7 +5206,7 @@
		"type": "tidelift"
		}
		],
		"time": "2023-01-25T22:02:09+00:00"
		"time": "2023-02-08T21:44:03+00:00"
		},
		{
		"name": "mikey179/vfsstream",
		@@ -5860,16 +5860,16 @@
		},
		{
		"name": "phpstan/phpstan",
		"version": "1.9.9",
		"version": "1.10.1",
		"source": {
		"type": "git",
		"url": "https://github.com/phpstan/phpstan.git",
		"reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d"
		"reference": "1cd5fc530a8b68702f3733ad64294b2a39564198"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f68d7cc3d0638a01bc6321cb826e4cae7fa6884d",
		"reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d",
		"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1cd5fc530a8b68702f3733ad64294b2a39564198",
		"reference": "1cd5fc530a8b68702f3733ad64294b2a39564198",
		"shasum": ""
		},
		"require": {
		@@ -5899,7 +5899,7 @@
		],
		"support": {
		"issues": "https://github.com/phpstan/phpstan/issues",
		"source": "https://github.com/phpstan/phpstan/tree/1.9.9"
		"source": "https://github.com/phpstan/phpstan/tree/1.10.1"
		},
		"funding": [
		{
		@@ -5915,7 +5915,7 @@
		"type": "tidelift"
		}
		],
		"time": "2023-01-11T14:39:22+00:00"
		"time": "2023-02-21T21:57:23+00:00"
		},
		{
		"name": "phpunit/php-code-coverage",

composer/Metapackage/DevDependencies/composer.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@
		"drupal/coder": "^8.3.10",
		"instaclick/php-webdriver": "^1.4.1",
		"justinrainbow/json-schema": "^5.2",
		"mglaman/phpstan-drupal": "^1.1.27",
		"mglaman/phpstan-drupal": "^1.1.29",
		"mikey179/vfsstream": "^1.6.11",
		"phpspec/prophecy-phpunit": "^2",
		"phpstan/extension-installer": "^1.1",
		"phpstan/phpstan": "^1.9.9",
		"phpstan/phpstan": "^1.10.1",
		"phpunit/phpunit": "^9.5",
		"symfony/browser-kit": "^6.2",
		"symfony/css-selector": "^6.2",

composer/Metapackage/PinnedDevDependencies/composer.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		"drupal/coder": "8.3.16",
		"instaclick/php-webdriver": "1.4.16",
		"justinrainbow/json-schema": "5.2.12",
		"mglaman/phpstan-drupal": "1.1.27",
		"mglaman/phpstan-drupal": "1.1.29",
		"mikey179/vfsstream": "v1.6.11",
		"myclabs/deep-copy": "1.11.0",
		"nikic/php-parser": "v4.15.2",
		@@ -36,7 +36,7 @@
		"phpspec/prophecy-phpunit": "v2.0.1",
		"phpstan/extension-installer": "1.2.0",
		"phpstan/phpdoc-parser": "1.13.1",
		"phpstan/phpstan": "1.9.9",
		"phpstan/phpstan": "1.10.1",
		"phpunit/php-code-coverage": "9.2.19",
		"phpunit/php-file-iterator": "3.0.6",
		"phpunit/php-invoker": "3.1.1",

core/lib/Drupal/Component/DependencyInjection/ReverseContainer.php

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ final class ReverseContainer {
		*/
		public function __construct(private readonly Container\|SymfonyContainer $serviceContainer) {
		$this->getServiceId = \Closure::bind(function ($service): ?string {
		/** @phpstan-ignore-next-line */
		return array_search($service, $this->services, TRUE) ?: NULL;
		}, $serviceContainer, $serviceContainer);
		}
		@@ -71,7 +70,6 @@ public function getId(object $service): ?string {
		*/
		public function recordContainer(): void {
		$service_recorder = \Closure::bind(function () : array {
		/** @phpstan-ignore-next-line */
		return $this->services;
		}, $this->serviceContainer, $this->serviceContainer);
		self::$recordedServices = array_merge(self::$recordedServices, array_flip(array_map([$this, 'generateServiceIdHash'], $service_recorder())));