minor #13326 [EventDispatcher] fixed deprecation notices in the EventDispatcher Component (fabpot)

fabpot · fabpot · commit dcfc33849912 · 2015-01-08T14:03:53.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [EventDispatcher] fixed deprecation notices in the EventDispatcher Component | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- 98047ae [EventDispatcher] fixed deprecation notices in the EventDispatcher Component
diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -71,7 +71,7 @@ public function getArgument($key)
             return $this->arguments[$key];
         }
 
-        throw new \InvalidArgumentException(sprintf('%s not found in %s', $key, $this->getName()));
+        throw new \InvalidArgumentException(sprintf('Argument "%s" not found.', $key));
     }
 
     /**
diff --git a/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php
@@ -118,10 +118,18 @@ public function testDispatch()
         $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(self::preFoo));
         $event = new Event();
         $return = $this->dispatcher->dispatch(self::preFoo, $event);
-        $this->assertEquals('pre.foo', $event->getName());
         $this->assertSame($event, $return);
     }
 
+    public function testLegacyDispatch()
+    {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
+        $event = new Event();
+        $return = $this->dispatcher->dispatch(self::preFoo, $event);
+        $this->assertEquals('pre.foo', $event->getName());
+    }
+
     public function testDispatchForClosure()
     {
         $invoked = 0;
@@ -239,8 +247,10 @@ public function testRemoveSubscriberWithMultipleListeners()
         $this->assertFalse($this->dispatcher->hasListeners(self::preFoo));
     }
 
-    public function testEventReceivesTheDispatcherInstance()
+    public function testLegacyEventReceivesTheDispatcherInstance()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $dispatcher = null;
         $this->dispatcher->addListener('test', function ($event) use (&$dispatcher) {
             $dispatcher = $event->getDispatcher();

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function getArgument($key)`
`71`	`71`	`return $this->arguments[$key];`
`72`	`72`	`}`
`73`	`73`
`74`		`- throw new \InvalidArgumentException(sprintf('%s not found in %s', $key, $this->getName()));`
	`74`	`+ throw new \InvalidArgumentException(sprintf('Argument "%s" not found.', $key));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`