Merge remote-tracking branch 'upstream/master' into types

keradus · Dec 18, 2024 · 2a42107 · 2a42107
2 parents f471263 + a942a21
commit 2a42107
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "symfony/polyfill-mbstring": "^1.28",
         "symfony/polyfill-php80": "^1.28",
         "symfony/polyfill-php81": "^1.28",
-        "symfony/process": "^5.4 || ^6.0 || ^7.0",
+        "symfony/process": "^5.4 || ^6.0 || ^7.0 <7.2",
         "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {

diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -9,9 +9,9 @@
         "mi-schi/phpmd-extension": "^4.3.0",
         "phpmd/phpmd": "^2.15.0",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.0.2",
-        "phpstan/phpstan-phpunit": "^2.0.1",
-        "phpstan/phpstan-strict-rules": "^2.0.0",
+        "phpstan/phpstan": "^2.0.4",
+        "phpstan/phpstan-phpunit": "^2.0.2",
+        "phpstan/phpstan-strict-rules": "^2.0.1",
         "phpstan/phpstan-symfony": "^2.0.0"
     },
     "config": {

diff --git a/dev-tools/composer.lock b/dev-tools/composer.lock
diff --git a/dev-tools/phpstan/baseline.php b/dev-tools/phpstan/baseline.php
@@ -3157,12 +3157,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/../../tests/Test/TestCaseUtils.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Property PhpCsFixer\\\\Tests\\\\Test\\\\TokensWithObservedTransformers\\:\\:\\$observedModificationsPerTransformer \\(array\\<string, list\\<int\\|string\\>\\>\\) does not accept non\\-empty\\-array\\<int\\|string, list\\<int\\|string\\>\\>\\.$#',
-	'identifier' => 'assign.propertyType',
-	'count' => 1,
-	'path' => __DIR__ . '/../../tests/Test/TokensWithObservedTransformers.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Property PhpCsFixer\\\\Tests\\\\TestCase\\:\\:\\$actualDeprecations \\(list\\<string\\>\\) does not accept array\\<int\\<0, max\\>, string\\>\\.$#',
 	'identifier' => 'assign.propertyType',