Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/console
zendframework · Jul 12, 2012 · 27f4879 · 27f4879
2 parents 59a1084 + b26220b
commit 27f4879
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -1,5 +1,6 @@
 {
     "name": "zendframework/zend-eventmanager",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",

diff --git a/src/SharedEventManager.php b/src/SharedEventManager.php
@@ -39,7 +39,8 @@ class SharedEventManager implements SharedEventManagerInterface
      * "getAll" event of both an AbstractResource and EntityResource:
      *
      * <code>
-     * SharedEventManager::getInstance()->connect(
+     * $sharedEventManager = new SharedEventManager();
+     * $sharedEventManager->attach(
      *     array('My\Resource\AbstractResource', 'My\Resource\EntityResource'),
      *     'getAll',
      *     function ($e) use ($cache) {

diff --git a/test/EventManagerTest.php b/test/EventManagerTest.php
@@ -10,14 +10,14 @@
 
 namespace ZendTest\EventManager;
 
-use ArrayIterator,
-    stdClass,
-    Zend\EventManager\Event,
-    Zend\EventManager\EventInterface,
-    Zend\EventManager\EventManager,
-    Zend\EventManager\ResponseCollection,
-    Zend\EventManager\StaticEventManager,
-    Zend\Stdlib\CallbackHandler;
+use ArrayIterator;
+use stdClass;
+use Zend\EventManager\Event;
+use Zend\EventManager\EventInterface;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\ResponseCollection;
+use Zend\EventManager\StaticEventManager;
+use Zend\Stdlib\CallbackHandler;
 
 /**
  * @category   Zend

diff --git a/test/FilterChainTest.php b/test/FilterChainTest.php
@@ -9,8 +9,9 @@
  */
 
 namespace ZendTest\Stdlib;
-use Zend\EventManager\FilterChain,
-    Zend\Stdlib\CallbackHandler;
+
+use Zend\EventManager\FilterChain;
+use Zend\Stdlib\CallbackHandler;
 
 /**
  * @category   Zend

diff --git a/test/GlobalEventManagerTest.php b/test/GlobalEventManagerTest.php
@@ -9,8 +9,9 @@
  */
 
 namespace ZendTest\EventManager;
-use Zend\EventManager\GlobalEventManager,
-    Zend\EventManager\EventManager;
+
+use Zend\EventManager\GlobalEventManager;
+use Zend\EventManager\EventManager;
 
 /**
  * @category   Zend

diff --git a/test/StaticEventManagerTest.php b/test/StaticEventManagerTest.php
@@ -10,10 +10,10 @@
 
 namespace ZendTest\EventManager;
 
-use PHPUnit_Framework_TestCase as TestCase,
-    stdClass,
-    Zend\EventManager\EventManager,
-    Zend\EventManager\StaticEventManager;
+use PHPUnit_Framework_TestCase as TestCase;
+use stdClass;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\StaticEventManager;
 
 /**
  * @category   Zend

diff --git a/test/StaticIntegrationTest.php b/test/StaticIntegrationTest.php
@@ -10,9 +10,9 @@
 
 namespace ZendTest\EventManager;
 
-use Zend\EventManager\EventManager,
-    Zend\EventManager\StaticEventManager,
-    PHPUnit_Framework_TestCase as TestCase;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\StaticEventManager;
+use PHPUnit_Framework_TestCase as TestCase;
 
 /**
  * @category   Zend

diff --git a/test/TestAsset/ClassWithEvents.php b/test/TestAsset/ClassWithEvents.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\EventManager\TestAsset;
 
-use Zend\EventManager\EventManagerInterface,
-    Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerInterface;
+use Zend\EventManager\EventManager;
 
 /**
  * @category   Zend

diff --git a/test/TestAsset/MockAggregate.php b/test/TestAsset/MockAggregate.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\EventManager\TestAsset;
 
-use Zend\EventManager\EventManagerInterface,
-    Zend\EventManager\ListenerAggregateInterface;
+use Zend\EventManager\EventManagerInterface;
+use Zend\EventManager\ListenerAggregateInterface;
 
 /**
  * @category   Zend

diff --git a/test/TestAsset/StaticEventsMock.php b/test/TestAsset/StaticEventsMock.php
@@ -10,8 +10,8 @@
 
 namespace ZendTest\EventManager\TestAsset;
 
-use Zend\EventManager\SharedEventManagerInterface,
-    Zend\Stdlib\CallbackHandler;
+use Zend\EventManager\SharedEventManagerInterface;
+use Zend\Stdlib\CallbackHandler;
 
 /**
  * @category   Zend