Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 65b7d208280f · 2020-10-24T14:01:57.000+02:00
* 4.4:
  fix merge
  Remove branch-version (keep them for contracts only)
  [HttpClient] relax auth bearer format requirements
  [PHPUnitBridge] Silence errors from mkdir()
  [DependencyInjection] Preload classes with union types correctly.
  [Serializer] fix decoding float XML attributes starting with 0
  add missing dutch translations
  Support PHPUnit 8 and PHPUnit 9 in constraint compatibility trait
  Add expectDeprecation, expectNotice, expectWarning, and expectError to TestCase polyfill
  Add missing exporter function for PHPUnit 7
  [Validator] Add missing romanian translations
  [Cache] Use correct expiry in ChainAdapter
  do not translate null placeholders or titles
diff --git a/composer.json b/composer.json
@@ -34,8 +34,5 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-version": "5.1"
-    }
+    "minimum-stability": "dev"
 }

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,5 @@`
`34`	`34`	`"/Tests/"`
`35`	`35`	`]`
`36`	`36`	`},`
`37`		`- "minimum-stability": "dev",`
`38`		`- "extra": {`
`39`		`- "branch-version": "5.1"`
`40`		`- }`
	`37`	`+ "minimum-stability": "dev"`
`41`	`38`	`}`