merged branch mtdowling/event_dispatcher_add_iterator (PR #5268)

fabpot · fabpot · commit 7fe18d13a08d · 2012-08-18T10:28:12.000+02:00
Commits ------- 0ad00f8 [EventDispatcher] Adding IteratorAggregate to GenericEvent Discussion ---------- [EventDispatcher] Adding IteratorAggregate to GenericEvent --------------------------------------------------------------------------- by drak at 2012-08-16T07:43:29Z What is the use case for this that it should be part of the Generic event? --------------------------------------------------------------------------- by mtdowling at 2012-08-16T17:12:28Z This allows for the GenericEvent to be even more generic. Now listeners don't need to know an exact key from the arguments, but rather can iterate over the arguments to find what they are looking for. This makes the GenericEvent more like an array. --------------------------------------------------------------------------- by mtdowling at 2012-08-17T19:31:04Z How would this be a nasty break? It's just giving the GenericEvent more capabilities with IteratorAggregate. This is a completely separate PR from the one that flipped the constructor args. --------------------------------------------------------------------------- by schmittjoh at 2012-08-17T19:34:47Z Why are you not just doing ``foreach ($event->getArguments() as $arg) { /** ... */ }``? If you just have ``foreach ($event)``, to me at least it would not be so clear what we are actually iterating over. --------------------------------------------------------------------------- by mtdowling at 2012-08-17T19:39:23Z This class already has ArrayAccess. If you're already using this class like an array, then I think you should expect to be able to iterate it like an array. I'm just finishing that concept off by implementing IteratorAggregate. --------------------------------------------------------------------------- by schmittjoh at 2012-08-17T19:47:43Z Indeed, if we already have ArrayAccess which we probably don't want to remove again, then that seems reasonable.
diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -18,7 +18,7 @@
  *
  * @author Drak <drak@zikula.org>
  */
-class GenericEvent extends Event implements \ArrayAccess
+class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate
 {
     /**
      * Observer pattern subject.
@@ -177,4 +177,14 @@ public function offsetExists($key)
     {
         return $this->hasArgument($key);
     }
+
+    /**
+     * IteratorAggregate for iterating over the object like an array
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->arguments);
+    }
 }
diff --git a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
@@ -128,4 +128,13 @@ public function testGetSubject()
     {
         $this->assertSame($this->subject, $this->event->getSubject());
     }
+
+    public function testHasIterator()
+    {
+        $data = array();
+        foreach ($this->event as $key => $value) {
+            $data[$key] = $value;
+        }
+        $this->assertEquals(array('name' => 'Event'), $data);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Drak <drak@zikula.org>`
`20`	`20`	`*/`
`21`		`-class GenericEvent extends Event implements \ArrayAccess`
	`21`	`+class GenericEvent extends Event implements \ArrayAccess, \IteratorAggregate`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`	`24`	`* Observer pattern subject.`
`@@ -177,4 +177,14 @@ public function offsetExists($key)`
`177`	`177`	`{`
`178`	`178`	`return $this->hasArgument($key);`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+ /**`
	`182`	`+ * IteratorAggregate for iterating over the object like an array`
	`183`	`+ *`
	`184`	`+ * @return \ArrayIterator`
	`185`	`+ */`
	`186`	`+ public function getIterator()`
	`187`	`+ {`
	`188`	`+ return new \ArrayIterator($this->arguments);`
	`189`	`+ }`
`180`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,13 @@ public function testGetSubject()`
`128`	`128`	`{`
`129`	`129`	`$this->assertSame($this->subject, $this->event->getSubject());`
`130`	`130`	`}`
	`131`	`+`
	`132`	`+ public function testHasIterator()`
	`133`	`+ {`
	`134`	`+ $data = array();`
	`135`	`+ foreach ($this->event as $key => $value) {`
	`136`	`+ $data[$key] = $value;`
	`137`	`+ }`
	`138`	`+ $this->assertEquals(array('name' => 'Event'), $data);`
	`139`	`+ }`
`131`	`140`	`}`