Hot fix

nicolas-grekas · nicolas-grekas · commit f8fa1366521b · 2015-09-10T20:17:51.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
@@ -49,7 +49,7 @@ class ProfilerListener implements EventSubscriberInterface
      */
     public function __construct(Profiler $profiler, $requestStack = null, $matcher = null, $onlyException = false, $onlyMasterRequests = false)
     {
-        if ($requestStack instanceof RequestMatcherInterface || $onlyMasterRequests instanceof RequestStack) {
+        if ($requestStack instanceof RequestMatcherInterface || (null !== $matcher && !$matcher instanceof RequestMatcherInterface) || $onlyMasterRequests instanceof RequestStack) {
             $tmp = $onlyMasterRequests;
             $onlyMasterRequests = $onlyException;
             $onlyException = $matcher;

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class ProfilerListener implements EventSubscriberInterface`
`49`	`49`	`*/`
`50`	`50`	`public function __construct(Profiler $profiler, $requestStack = null, $matcher = null, $onlyException = false, $onlyMasterRequests = false)`
`51`	`51`	`{`
`52`		`- if ($requestStack instanceof RequestMatcherInterface \|\| $onlyMasterRequests instanceof RequestStack) {`
	`52`	`+ if ($requestStack instanceof RequestMatcherInterface \|\| (null !== $matcher && !$matcher instanceof RequestMatcherInterface) \|\| $onlyMasterRequests instanceof RequestStack) {`
`53`	`53`	`$tmp = $onlyMasterRequests;`
`54`	`54`	`$onlyMasterRequests = $onlyException;`
`55`	`55`	`$onlyException = $matcher;`