Merge branch '5.1' into 5.x

nicolas-grekas · nicolas-grekas · commit d3bae5e5fedd · 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
@@ -28,5 +28,8 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-version": "5.2"
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,8 @@`
`28`	`28`	`"/Tests/"`
`29`	`29`	`]`
`30`	`30`	`},`
`31`		`- "minimum-stability": "dev"`
	`31`	`+ "minimum-stability": "dev",`
	`32`	`+ "extra": {`
	`33`	`+ "branch-version": "5.2"`
	`34`	`+ }`
`32`	`35`	`}`