Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit c7b8ea7edbdb · 2019-12-07T17:27:44.000+01:00
* 4.3:
  gracefully handle missing event dispatchers
  [Cache] fix memory leak when using PhpArrayAdapter
  fix parsing negative octal numbers
  [SecurityBundle] Properly escape regex in AddSessionDomainConstraintPass
  [Config] never try loading failed classes twice with ClassExistenceResource
diff --git a/Authorization/Voter/TraceableVoter.php b/Authorization/Voter/TraceableVoter.php
@@ -31,7 +31,12 @@ class TraceableVoter implements VoterInterface
     public function __construct(VoterInterface $voter, EventDispatcherInterface $eventDispatcher)
     {
         $this->voter = $voter;
-        $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+
+        if (class_exists(LegacyEventDispatcherProxy::class)) {
+            $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);
+        } else {
+            $this->eventDispatcher = $eventDispatcher;
+        }
     }
 
     public function vote(TokenInterface $token, $subject, array $attributes): int

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,12 @@ class TraceableVoter implements VoterInterface`
`31`	`31`	`public function __construct(VoterInterface $voter, EventDispatcherInterface $eventDispatcher)`
`32`	`32`	`{`
`33`	`33`	`$this->voter = $voter;`
`34`		`- $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
	`34`	`+`
	`35`	`+ if (class_exists(LegacyEventDispatcherProxy::class)) {`
	`36`	`+ $this->eventDispatcher = LegacyEventDispatcherProxy::decorate($eventDispatcher);`
	`37`	`+ } else {`
	`38`	`+ $this->eventDispatcher = $eventDispatcher;`
	`39`	`+ }`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`public function vote(TokenInterface $token, $subject, array $attributes): int`