[EventDispatcher] Remove data property

src/Symfony/Component/EventDispatcher/GenericEvent.php

@@ -34,25 +34,16 @@ class GenericEvent extends Event implements \ArrayAccess
      */
     protected $arguments;
 
-    /**
-     * Storage for any process type events.
-     *
-     * @var mixed
-     */
-    protected $data;
-
     /**
      * Encapsulate an event with $subject, $args, and $data.
      *
      * @param mixed  $subject   The subject of the event, usually an object.
      * @param array  $arguments Arguments to store in the event.
-     * @param mixed  $data      Convenience argument of data for optional processing.
      */
-    public function __construct($subject = null, array $arguments = array(), $data = null)
+    public function __construct($subject = null, array $arguments = array())
     {
         $this->subject = $subject;
         $this->arguments = $arguments;
-        $this->data = $data;
     }
 
     /**
@@ -134,30 +125,6 @@ public function hasArgument($key)
         return array_key_exists($key, $this->arguments);
     }
 
-    /**
-     * Getter for Data property.
-     *
-     * @return mixed Data property.
-     */
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Set data.
-     *
-     * @param mixed $data Data to be saved.
-     *
-     * @return GenericEvent
-     */
-    public function setData($data)
-    {
-        $this->data = $data;
-
-        return $this;
-    }
-
     /**
      * ArrayAccess for argument getter.
      *

src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php

@@ -50,33 +50,33 @@ protected function tearDown()
 
     public function test__construct()
     {
-        $this->assertEquals($this->event, new GenericEvent($this->subject, array('name' => 'Event'), 'foo'));
+        $this->assertEquals($this->event, new GenericEvent($this->subject, array('name' => 'Event')));
     }
 
     /**
      * Tests Event->getArgs()
      */
-    public function testGetArgs()
+    public function testGetArguments()
     {
         // test getting all
         $this->assertSame(array('name' => 'Event'), $this->event->getArguments());
     }
 
-    public function testSetArgs()
+    public function testSetArguments()
     {
         $result = $this->event->setArguments(array('foo' => 'bar'));
         $this->assertAttributeSame(array('foo' => 'bar'), 'arguments', $this->event);
         $this->assertSame($this->event, $result);
     }
 
-    public function testSetArg()
+    public function testSetArgument()
     {
         $result = $this->event->setArgument('foo2', 'bar2');
         $this->assertAttributeSame(array('name' => 'Event', 'foo2' => 'bar2'), 'arguments', $this->event);
         $this->assertEquals($this->event, $result);
     }
 
-    public function testGetArg()
+    public function testGetArgument()
     {
         // test getting key
         $this->assertEquals('Event', $this->event->getArgument('name'));
@@ -118,7 +118,7 @@ public function testOffsetIsset()
         $this->assertFalse(isset($this->event['nameNotExist']));
     }
 
-    public function testHasArg()
+    public function testHasArgument()
     {
         $this->assertTrue($this->event->hasArgument('name'));
         $this->assertFalse($this->event->hasArgument('nameNotExist'));
@@ -128,17 +128,4 @@ public function testGetSubject()
     {
         $this->assertSame($this->subject, $this->event->getSubject());
     }
-
-
-    public function testGetData()
-    {
-        $this->event->setData("Don't drink and drive.");
-        $this->assertEquals("Don't drink and drive.", $this->event->getData());
-    }
-
-    public function testSetData()
-    {
-        $this->event->setData("Don't drink and drive.");
-        $this->assertEquals("Don't drink and drive.", $this->event->getData());
-    }
 }