Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit fa2ed7fde6c1 · 2021-02-04T18:52:48.000+01:00
* 5.2:
  Allow psr/cache v2
  [DeprecationErrorHandler] Fix tests
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "^2",
         "twig/twig": "^2.13|^3.0.4",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/container": "^1.0",
         "psr/event-dispatcher": "^1.0",
         "psr/link": "^1.0",
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -174,6 +174,8 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st
     {
         $trace = [
             ['class' => 'MyClass1', 'function' => 'myMethod'],
+            ['function' => 'trigger_error'],
+            ['class' => SymfonyTestsListenerTrait::class, 'function' => 'endTest'],
             ['class' => $traceClass, 'function' => 'myMethod'],
         ];
         $deprecation = new Deprecation($message, $trace, $file);
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
@@ -16,13 +16,13 @@
         }
     ],
     "provide": {
-        "psr/cache-implementation": "1.0",
+        "psr/cache-implementation": "1.0|2.0",
         "psr/simple-cache-implementation": "1.0",
         "symfony/cache-implementation": "1.0"
     },
     "require": {
         "php": ">=7.2.5",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/log": "^1.1",
         "symfony/cache-contracts": "^1.1.7|^2",
         "symfony/polyfill-php80": "^1.15",
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -41,7 +41,7 @@
         "symfony/stopwatch": "^4.4|^5.0",
         "symfony/translation": "^4.4|^5.0",
         "symfony/translation-contracts": "^1.1|^2",
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "twig/twig": "^2.13|^3.0.4"
     },
     "provide": {
diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json
@@ -25,7 +25,7 @@
         "symfony/redis-messenger": "^5.1"
     },
     "require-dev": {
-        "psr/cache": "~1.0",
+        "psr/cache": "^1.0|^2.0",
         "symfony/console": "^4.4|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/event-dispatcher": "^4.4|^5.0",
diff --git a/src/Symfony/Component/RateLimiter/composer.json b/src/Symfony/Component/RateLimiter/composer.json
@@ -21,7 +21,7 @@
         "symfony/options-resolver": "^5.1"
     },
     "require-dev": {
-        "psr/cache": "^1.0"
+        "psr/cache": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\RateLimiter\\": "" },
diff --git a/src/Symfony/Contracts/Cache/composer.json b/src/Symfony/Contracts/Cache/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "psr/cache": "^1.0"
+        "psr/cache": "^1.0|^2.0"
     },
     "suggest": {
         "symfony/cache-implementation": ""
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=7.2.5",
-        "psr/cache": "^1.0",
+        "psr/cache": "^1.0|^2.0",
         "psr/container": "^1.0",
         "psr/event-dispatcher": "^1.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,8 @@ public function testGetTypeDetectsSelf(string $expectedType, string $message, st`
`174`	`174`	`{`
`175`	`175`	`$trace = [`
`176`	`176`	`['class' => 'MyClass1', 'function' => 'myMethod'],`
	`177`	`+ ['function' => 'trigger_error'],`
	`178`	`+ ['class' => SymfonyTestsListenerTrait::class, 'function' => 'endTest'],`
`177`	`179`	`['class' => $traceClass, 'function' => 'myMethod'],`
`178`	`180`	`];`
`179`	`181`	`$deprecation = new Deprecation($message, $trace, $file);`