Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 5ac06cf42762 · 2021-06-05T10:56:57.000+02:00
* 4.4:
  Fix opcache preload with alias classes
diff --git a/Authorization/TraceableAccessDecisionManager.php b/Authorization/TraceableAccessDecisionManager.php
@@ -107,4 +107,6 @@ public function getDecisionLog(): array
     }
 }
 
-class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);
+if (!class_exists(DebugAccessDecisionManager::class, false)) {
+    class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);
+}

Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,6 @@ public function getDecisionLog(): array`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`
`110`		`-class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);`
	`110`	`+if (!class_exists(DebugAccessDecisionManager::class, false)) {`
	`111`	`+ class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);`
	`112`	`+}`