Merge branch '4.4' into patch-2

vitman · web-flow · commit 3aa246977ee5 · 2021-12-27T00:14:42.000+03:00
diff --git a/composer.json b/composer.json
@@ -152,6 +152,11 @@
         "ocramius/proxy-manager": "<2.1",
         "phpunit/phpunit": "<5.4.3"
     },
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
+    },
     "autoload": {
         "psr-4": {
             "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "composer/package-versions-deprecated": "^1.8",
         "friendsofphp/proxy-manager-lts": "^1.0.2",
         "symfony/dependency-injection": "^4.0|^5.0",
         "symfony/polyfill-php80": "^1.16"
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -19,6 +19,9 @@
 
 abstract class HttpClientTestCase extends BaseHttpClientTestCase
 {
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnDestruct()
     {
         if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.lb.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" target-language="lb" datatype="plaintext" original="security.en.xlf">
+    <file source-language="en" datatype="plaintext" original="file.ext">
         <body>
             <trans-unit id="1">
                 <source>An authentication exception occurred.</source>

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`
`20`	`20`	`abstract class HttpClientTestCase extends BaseHttpClientTestCase`
`21`	`21`	`{`
	`22`	`+ /**`
	`23`	`+ * @group transient-on-macos`
	`24`	`+ */`
`22`	`25`	`public function testTimeoutOnDestruct()`
`23`	`26`	`{`
`24`	`27`	`if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {`