Skip to content
Snippets Groups Projects
Commit 843e0a80 authored by catch's avatar catch
Browse files

Issue #3341254 by Spokje, longwave: Fix failing "updated deps" test-runs on 10.x.x

parent 2fdab0bd
Branches
Tags
6 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons
Hide whitespace changes
Inline Side-by-side
composer.lock
+ 13
− 13
View file @ 843e0a80
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "325f7170ea2137245a2bbcc5e2de9011", "content-hash": "31ed43e991e91dae14239ba7578c8320",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
...@@ -5106,16 +5106,16 @@ ...@@ -5106,16 +5106,16 @@
}, },
{ {
"name": "mglaman/phpstan-drupal", "name": "mglaman/phpstan-drupal",
"version": "1.1.27", "version": "1.1.29",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mglaman/phpstan-drupal.git", "url": "https://github.com/mglaman/phpstan-drupal.git",
"reference": "61daa574664fa138f42dc7e883de9a12a7703462" "reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/61daa574664fa138f42dc7e883de9a12a7703462", "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/e6f6191c53b159013fcbd186d7f85511f3f96ff8",
"reference": "61daa574664fa138f42dc7e883de9a12a7703462", "reference": "e6f6191c53b159013fcbd186d7f85511f3f96ff8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5190,7 +5190,7 @@ ...@@ -5190,7 +5190,7 @@
"description": "Drupal extension and rules for PHPStan", "description": "Drupal extension and rules for PHPStan",
"support": { "support": {
"issues": "https://github.com/mglaman/phpstan-drupal/issues", "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": [ "funding": [
{ {
...@@ -5206,7 +5206,7 @@ ...@@ -5206,7 +5206,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-25T22:02:09+00:00" "time": "2023-02-08T21:44:03+00:00"
}, },
{ {
"name": "mikey179/vfsstream", "name": "mikey179/vfsstream",
...@@ -5860,16 +5860,16 @@ ...@@ -5860,16 +5860,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.9.9", "version": "1.10.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d" "reference": "1cd5fc530a8b68702f3733ad64294b2a39564198"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f68d7cc3d0638a01bc6321cb826e4cae7fa6884d", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1cd5fc530a8b68702f3733ad64294b2a39564198",
"reference": "f68d7cc3d0638a01bc6321cb826e4cae7fa6884d", "reference": "1cd5fc530a8b68702f3733ad64294b2a39564198",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5899,7 +5899,7 @@ ...@@ -5899,7 +5899,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "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": [ "funding": [
{ {
...@@ -5915,7 +5915,7 @@ ...@@ -5915,7 +5915,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-11T14:39:22+00:00" "time": "2023-02-21T21:57:23+00:00"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
......
composer/Metapackage/DevDependencies/composer.json
+ 2
− 2
View file @ 843e0a80
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
"drupal/coder": "^8.3.10", "drupal/coder": "^8.3.10",
"instaclick/php-webdriver": "^1.4.1", "instaclick/php-webdriver": "^1.4.1",
"justinrainbow/json-schema": "^5.2", "justinrainbow/json-schema": "^5.2",
"mglaman/phpstan-drupal": "^1.1.27", "mglaman/phpstan-drupal": "^1.1.29",
"mikey179/vfsstream": "^1.6.11", "mikey179/vfsstream": "^1.6.11",
"phpspec/prophecy-phpunit": "^2", "phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.1", "phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.9.9", "phpstan/phpstan": "^1.10.1",
"phpunit/phpunit": "^9.5", "phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.2", "symfony/browser-kit": "^6.2",
"symfony/css-selector": "^6.2", "symfony/css-selector": "^6.2",
......
composer/Metapackage/PinnedDevDependencies/composer.json
+ 2
− 2
View file @ 843e0a80
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"drupal/coder": "8.3.16", "drupal/coder": "8.3.16",
"instaclick/php-webdriver": "1.4.16", "instaclick/php-webdriver": "1.4.16",
"justinrainbow/json-schema": "5.2.12", "justinrainbow/json-schema": "5.2.12",
"mglaman/phpstan-drupal": "1.1.27", "mglaman/phpstan-drupal": "1.1.29",
"mikey179/vfsstream": "v1.6.11", "mikey179/vfsstream": "v1.6.11",
"myclabs/deep-copy": "1.11.0", "myclabs/deep-copy": "1.11.0",
"nikic/php-parser": "v4.15.2", "nikic/php-parser": "v4.15.2",
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"phpspec/prophecy-phpunit": "v2.0.1", "phpspec/prophecy-phpunit": "v2.0.1",
"phpstan/extension-installer": "1.2.0", "phpstan/extension-installer": "1.2.0",
"phpstan/phpdoc-parser": "1.13.1", "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-code-coverage": "9.2.19",
"phpunit/php-file-iterator": "3.0.6", "phpunit/php-file-iterator": "3.0.6",
"phpunit/php-invoker": "3.1.1", "phpunit/php-invoker": "3.1.1",
......
core/lib/Drupal/Component/DependencyInjection/ReverseContainer.php
+ 0
− 2
View file @ 843e0a80
...@@ -34,7 +34,6 @@ final class ReverseContainer { ...@@ -34,7 +34,6 @@ final class ReverseContainer {
*/ */
public function __construct(private readonly Container|SymfonyContainer $serviceContainer) { public function __construct(private readonly Container|SymfonyContainer $serviceContainer) {
$this->getServiceId = \Closure::bind(function ($service): ?string { $this->getServiceId = \Closure::bind(function ($service): ?string {
/** @phpstan-ignore-next-line */
return array_search($service, $this->services, TRUE) ?: NULL; return array_search($service, $this->services, TRUE) ?: NULL;
}, $serviceContainer, $serviceContainer); }, $serviceContainer, $serviceContainer);
} }
...@@ -71,7 +70,6 @@ public function getId(object $service): ?string { ...@@ -71,7 +70,6 @@ public function getId(object $service): ?string {
*/ */
public function recordContainer(): void { public function recordContainer(): void {
$service_recorder = \Closure::bind(function () : array { $service_recorder = \Closure::bind(function () : array {
/** @phpstan-ignore-next-line */
return $this->services; return $this->services;
}, $this->serviceContainer, $this->serviceContainer); }, $this->serviceContainer, $this->serviceContainer);
self::$recordedServices = array_merge(self::$recordedServices, array_flip(array_map([$this, 'generateServiceIdHash'], $service_recorder()))); self::$recordedServices = array_merge(self::$recordedServices, array_flip(array_map([$this, 'generateServiceIdHash'], $service_recorder())));
......
core/phpstan-baseline.neon
+ 1
− 16
View file @ 843e0a80
...@@ -655,11 +655,6 @@ parameters: ...@@ -655,11 +655,6 @@ parameters:
count: 1 count: 1
path: lib/Drupal/Core/Lock/NullLockBackend.php path: lib/Drupal/Core/Lock/NullLockBackend.php
-
message: "#^Relying on entity queries to check access by default is deprecated in drupal\\:9\\.2\\.0 and an error will be thrown from drupal\\:10\\.0\\.0\\. Call \\\\Drupal\\\\Core\\\\Entity\\\\Query\\\\QueryInterface\\:\\:accessCheck\\(\\) with TRUE or FALSE to specify whether access should be checked\\.$#"
count: 1
path: lib/Drupal/Core/Menu/DefaultMenuLinkTreeManipulators.php
- -
message: "#^Variable \\$parent in isset\\(\\) always exists and is not nullable\\.$#" message: "#^Variable \\$parent in isset\\(\\) always exists and is not nullable\\.$#"
count: 1 count: 1
...@@ -800,11 +795,6 @@ parameters: ...@@ -800,11 +795,6 @@ parameters:
count: 1 count: 1
path: lib/Drupal/Core/Utility/PhpRequirements.php path: lib/Drupal/Core/Utility/PhpRequirements.php
-
message: "#^Relying on entity queries to check access by default is deprecated in drupal\\:9\\.2\\.0 and an error will be thrown from drupal\\:10\\.0\\.0\\. Call \\\\Drupal\\\\Core\\\\Entity\\\\Query\\\\QueryInterface\\:\\:accessCheck\\(\\) with TRUE or FALSE to specify whether access should be checked\\.$#"
count: 1
path: lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
- -
message: "#^Method Drupal\\\\action\\\\Form\\\\ActionFormBase\\:\\:save\\(\\) should return int but return statement is missing\\.$#" message: "#^Method Drupal\\\\action\\\\Form\\\\ActionFormBase\\:\\:save\\(\\) should return int but return statement is missing\\.$#"
count: 1 count: 1
...@@ -1857,7 +1847,7 @@ parameters: ...@@ -1857,7 +1847,7 @@ parameters:
- -
message: "#^Relying on entity queries to check access by default is deprecated in drupal\\:9\\.2\\.0 and an error will be thrown from drupal\\:10\\.0\\.0\\. Call \\\\Drupal\\\\Core\\\\Entity\\\\Query\\\\QueryInterface\\:\\:accessCheck\\(\\) with TRUE or FALSE to specify whether access should be checked\\.$#" message: "#^Relying on entity queries to check access by default is deprecated in drupal\\:9\\.2\\.0 and an error will be thrown from drupal\\:10\\.0\\.0\\. Call \\\\Drupal\\\\Core\\\\Entity\\\\Query\\\\QueryInterface\\:\\:accessCheck\\(\\) with TRUE or FALSE to specify whether access should be checked\\.$#"
count: 3 count: 2
path: modules/node/node.module path: modules/node/node.module
- -
...@@ -2440,11 +2430,6 @@ parameters: ...@@ -2440,11 +2430,6 @@ parameters:
count: 1 count: 1
path: modules/user/src/RoleForm.php path: modules/user/src/RoleForm.php
-
message: "#^Relying on entity queries to check access by default is deprecated in drupal\\:9\\.2\\.0 and an error will be thrown from drupal\\:10\\.0\\.0\\. Call \\\\Drupal\\\\Core\\\\Entity\\\\Query\\\\QueryInterface\\:\\:accessCheck\\(\\) with TRUE or FALSE to specify whether access should be checked\\.$#"
count: 1
path: modules/user/src/UserListBuilder.php
- -
message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#" message: "#^Call to deprecated constant REQUEST_TIME\\: Deprecated in drupal\\:8\\.3\\.0 and is removed from drupal\\:11\\.0\\.0\\. Use \\\\Drupal\\:\\:time\\(\\)\\-\\>getRequestTime\\(\\); $#"
count: 2 count: 2
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment