Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit 3694fb534488 · 2020-10-14T18:43:39.000+02:00
* 4.4:
  [Contracts] add branch-aliases for dev-main
  [Cache] Make Redis initializers static
  Fix tests typo
  [Lock] Reset Key lifetime time before we acquire it
  [CI] Silence errors when remove file/dir on test tearDown()
diff --git a/composer.json b/composer.json
@@ -32,6 +32,9 @@
         }
     },
     "extra": {
-        "branch-version": "2.1"
+        "branch-version": "2.1",
+        "branch-alias": {
+            "dev-main": "2.1-dev"
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@`
`32`	`32`	`}`
`33`	`33`	`},`
`34`	`34`	`"extra": {`
`35`		`- "branch-version": "2.1"`
	`35`	`+ "branch-version": "2.1",`
	`36`	`+ "branch-alias": {`
	`37`	`+ "dev-main": "2.1-dev"`
	`38`	`+ }`
`36`	`39`	`}`
`37`	`40`	`}`