Merge branch 'master' into rfc/escaper

src/Event.php

@@ -18,9 +18,6 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\EventManager;
 
 use ArrayAccess;
@@ -36,7 +33,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Event implements EventDescription
+class Event implements EventInterface
 {
     /**
      * @var string Event name
@@ -112,13 +109,13 @@ public function getTarget()
      * 
      * @param  array|ArrayAccess|object $params 
      * @return Event
+     * @throws Exception\InvalidArgumentException
      */
     public function setParams($params)
     {
         if (!is_array($params) && !is_object($params)) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Event parameters must be an array or object; received "%s"',
-                (is_object($params) ? get_class($params) : gettype($params))
+                'Event parameters must be an array or object; received "%s"', gettype($params)
             ));
         }
 

src/EventDescription.php → src/EventInterface.php

@@ -18,11 +18,10 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 
-/**
- * @namespace
- */
 namespace Zend\EventManager;
 
+use ArrayAccess;
+
 /**
  * Representation of an event
  *
@@ -31,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface EventDescription
+interface EventInterface
 {
     /**
      * Get event name
@@ -97,7 +96,7 @@ public function setParams($params);
     public function setParam($name, $value);
 
     /**
-     * Indicate whether or not the parent EventCollection should stop propagating events
+     * Indicate whether or not the parent EventManagerInterface should stop propagating events
      * 
      * @param  bool $flag 
      * @return void