소스 검색

fixed more unit tests

Fabien Potencier 14 년 전
부모
커밋
90ca8e0404

+ 2 - 2
src/Symfony/Component/EventDispatcher/EventDispatcher.php

@@ -125,7 +125,7 @@ class EventDispatcher implements EventDispatcherInterface
      */
     public function addSubscriber(EventSubscriberInterface $subscriber, $priority = 0)
     {
-        foreach ((array) $subscriber->getSubscribedEvents() as $eventName => $method) {
+        foreach ($subscriber->getSubscribedEvents() as $eventName => $method) {
             $this->addListener($eventName, array($subscriber, $method), $priority);
         }
     }
@@ -135,7 +135,7 @@ class EventDispatcher implements EventDispatcherInterface
      */
     public function removeSubscriber(EventSubscriberInterface $subscriber)
     {
-        foreach ((array) $subscriber->getSubscribedEvents() as $eventName => $method) {
+        foreach ($subscriber->getSubscribedEvents() as $eventName => $method) {
             $this->removeListener($eventName, array($subscriber, $method));
         }
     }

+ 3 - 3
tests/Symfony/Tests/Component/HttpKernel/HttpCache/EsiListenerTest.php

@@ -29,7 +29,7 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase
         $response = new Response('foo <esi:include src="" />');
         $listener = new EsiListener(new Esi());
 
-        $dispatcher->addListener(CoreEvents::RESPONSE, $listener);
+        $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'));
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
         $dispatcher->dispatch(CoreEvents::RESPONSE, $event);
 
@@ -43,7 +43,7 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase
         $response = new Response('foo <esi:include src="" />');
         $listener = new EsiListener(new Esi());
 
-        $dispatcher->addListener(CoreEvents::RESPONSE, $listener);
+        $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'));
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
         $dispatcher->dispatch(CoreEvents::RESPONSE, $event);
 
@@ -57,7 +57,7 @@ class EsiListenerTest extends \PHPUnit_Framework_TestCase
         $response = new Response('foo');
         $listener = new EsiListener(new Esi());
 
-        $dispatcher->addListener(CoreEvents::RESPONSE, $listener);
+        $dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'));
         $event = new FilterResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response);
         $dispatcher->dispatch(CoreEvents::RESPONSE, $event);
 

+ 1 - 1
tests/Symfony/Tests/Component/HttpKernel/ResponseListenerTest.php

@@ -29,7 +29,7 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase
     {
         $this->dispatcher = new EventDispatcher();
         $listener = new ResponseListener('UTF-8');
-        $this->dispatcher->addListener(CoreEvents::RESPONSE, $listener);
+        $this->dispatcher->addListener(CoreEvents::RESPONSE, array($listener, 'onCoreResponse'));
 
         $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');