Merge branch 'event-manager' into experimental
This commit is contained in:
commit
52f382a859
@ -48,7 +48,7 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
|
|||||||
{
|
{
|
||||||
parent::triggerListener($listener, $eventName, $event);
|
parent::triggerListener($listener, $eventName, $event);
|
||||||
|
|
||||||
$listenerString = $this->listenerToString($listener);
|
$listenerString = $this->listenerToString($listener, $eventName);
|
||||||
|
|
||||||
if (null !== $this->logger) {
|
if (null !== $this->logger) {
|
||||||
$this->logger->debug(sprintf('Notified event "%s" to listener "%s"', $eventName, $listenerString));
|
$this->logger->debug(sprintf('Notified event "%s" to listener "%s"', $eventName, $listenerString));
|
||||||
@ -60,14 +60,14 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
|
|||||||
);
|
);
|
||||||
|
|
||||||
if ($event->isPropagationStopped() && null !== $this->logger) {
|
if ($event->isPropagationStopped() && null !== $this->logger) {
|
||||||
$this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', $this->listenerToString($listener), $eventName));
|
$this->logger->debug(sprintf('Listener "%s" stopped propagation of the event "%s"', $this->listenerToString($listener, $eventName), $eventName));
|
||||||
|
|
||||||
$skippedListeners = $this->getListeners($eventName);
|
$skippedListeners = $this->getListeners($eventName);
|
||||||
$skipped = false;
|
$skipped = false;
|
||||||
|
|
||||||
foreach ($skippedListeners as $skippedListener) {
|
foreach ($skippedListeners as $skippedListener) {
|
||||||
if ($skipped) {
|
if ($skipped) {
|
||||||
$this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', $this->listenerToString($skippedListener), $eventName));
|
$this->logger->debug(sprintf('Listener "%s" was not called for event "%s"', $this->listenerToString($skippedListener, $eventName), $eventName));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($skippedListener === $listener) {
|
if ($skippedListener === $listener) {
|
||||||
@ -92,9 +92,9 @@ class TraceableEventDispatcher extends ContainerAwareEventDispatcher implements
|
|||||||
{
|
{
|
||||||
$notCalled = array();
|
$notCalled = array();
|
||||||
|
|
||||||
foreach (array_keys($this->listeners) as $name) {
|
foreach (array_keys($this->getListeners()) as $name) {
|
||||||
foreach ($this->getListeners($name) as $listener) {
|
foreach ($this->getListeners($name) as $listener) {
|
||||||
$listener = $this->listenerToString($listener);
|
$listener = $this->listenerToString($listener, $name);
|
||||||
|
|
||||||
if (!isset($this->called[$name.'.'.$listener])) {
|
if (!isset($this->called[$name.'.'.$listener])) {
|
||||||
$notCalled[] = array(
|
$notCalled[] = array(
|
@ -153,12 +153,12 @@ class FrameworkExtension extends Extension
|
|||||||
'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
|
'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
|
||||||
'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',
|
'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',
|
||||||
|
|
||||||
'Symfony\\Bundle\\FrameworkBundle\\ContainerAwareEventDispatcher',
|
|
||||||
|
|
||||||
'Symfony\\Component\\EventDispatcher\\EventDispatcher',
|
'Symfony\\Component\\EventDispatcher\\EventDispatcher',
|
||||||
'Symfony\\Component\\EventDispatcher\\EventDispatcherInterface',
|
'Symfony\\Component\\EventDispatcher\\EventDispatcherInterface',
|
||||||
'Symfony\\Component\\EventDispatcher\\Event',
|
'Symfony\\Component\\EventDispatcher\\Event',
|
||||||
'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface',
|
'Symfony\\Component\\EventDispatcher\\EventSubscriberInterface',
|
||||||
|
|
||||||
|
'Symfony\\Bundle\\FrameworkBundle\\ContainerAwareEventDispatcher',
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Profiler;
|
|||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||||
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
|
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
|
||||||
use Symfony\Component\HttpKernel\Event\GetResponseFromExceptionEvent;
|
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
|
||||||
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
|
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
|
||||||
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
|
use Symfony\Component\HttpFoundation\RequestMatcherInterface;
|
||||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||||
@ -61,9 +61,9 @@ class ProfilerListener
|
|||||||
/**
|
/**
|
||||||
* Handles the onCoreException event.
|
* Handles the onCoreException event.
|
||||||
*
|
*
|
||||||
* @param GetResponseFromExceptionEvent $event A GetResponseFromExceptionEvent instance
|
* @param GetResponseForExceptionEvent $event A GetResponseForExceptionEvent instance
|
||||||
*/
|
*/
|
||||||
public function onCoreException(GetResponseFromExceptionEvent $event)
|
public function onCoreException(GetResponseForExceptionEvent $event)
|
||||||
{
|
{
|
||||||
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
|
if (HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
|
||||||
return;
|
return;
|
||||||
@ -79,6 +79,8 @@ class ProfilerListener
|
|||||||
*/
|
*/
|
||||||
public function filterCoreResponse(FilterResponseEvent $event)
|
public function filterCoreResponse(FilterResponseEvent $event)
|
||||||
{
|
{
|
||||||
|
$response = $event->getResponse();
|
||||||
|
|
||||||
if (null !== $this->matcher && !$this->matcher->matches($event->getRequest())) {
|
if (null !== $this->matcher && !$this->matcher->matches($event->getRequest())) {
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user