Merge branch '5.1' into 5.x

nicolas-grekas · nicolas-grekas · commit b1128c0ddea2 · 2020-10-14T19:08:19.000+02:00
* 5.1:
  [Contracts] add branch-aliases for dev-main
  [Cache] Make Redis initializers static
  [Messenger] Fixed typos in Connection
  [CI] Fixed build on AppVeyor
  Fix tests typo
  [Lock] Reset Key lifetime time before we acquire it
  [CI] Silence errors when remove file/dir on test tearDown()
  Fix tests
  Remove content-type check on toArray methods
diff --git a/composer.json b/composer.json
@@ -27,12 +27,13 @@
     },
     "minimum-stability": "dev",
     "extra": {
+        "branch-version": "2.3",
+        "branch-alias": {
+            "dev-main": "2.3-dev"
+        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    },
-    "extra": {
-        "branch-version": "2.3"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,13 @@`
`27`	`27`	`},`
`28`	`28`	`"minimum-stability": "dev",`
`29`	`29`	`"extra": {`
	`30`	`+ "branch-version": "2.3",`
	`31`	`+ "branch-alias": {`
	`32`	`+ "dev-main": "2.3-dev"`
	`33`	`+ },`
`30`	`34`	`"thanks": {`
`31`	`35`	`"name": "symfony/contracts",`
`32`	`36`	`"url": "https://github.com/symfony/contracts"`
`33`	`37`	`}`
`34`		`- },`
`35`		`- "extra": {`
`36`		`- "branch-version": "2.3"`
`37`	`38`	`}`
`38`	`39`	`}`