Merge branch 'hotfix/2685' into develop

Forward port zendframework/zendframework#2685 Conflicts: library/Zend/Code/Scanner/ClassScanner.php tests/ZendTest/ModuleManager/Listener/ListenerOptionsTest.php
zendframework · Oct 8, 2012 · eeb69a6 · eeb69a6
commit eeb69a6
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 9 deletions.
diff --git a/src/Listener/ConfigListener.php b/src/Listener/ConfigListener.php
@@ -10,7 +10,6 @@
 
 namespace Zend\ModuleManager\Listener;
 
-use ArrayAccess;
 use Traversable;
 use Zend\Config\Config;
 use Zend\Config\Factory as ConfigFactory;

diff --git a/test/Listener/AutoloaderListenerTest.php b/test/Listener/AutoloaderListenerTest.php
@@ -15,7 +15,6 @@
 use Zend\Loader\AutoloaderFactory;
 use Zend\ModuleManager\Listener\AutoloaderListener;
 use Zend\ModuleManager\Listener\ModuleResolverListener;
-use Zend\ModuleManager\Listener\ListenerOptions;
 use Zend\ModuleManager\ModuleManager;
 
 class AutoloaderListenerTest extends TestCase

diff --git a/test/Listener/DefaultListenerAggregateTest.php b/test/Listener/DefaultListenerAggregateTest.php
@@ -10,9 +10,7 @@
 
 namespace ZendTest\ModuleManager\Listener;
 
-use InvalidArgumentException;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\EventManager\EventManager;
 use Zend\Loader\ModuleAutoloader;
 use Zend\Loader\AutoloaderFactory;
 use Zend\ModuleManager\Listener\ListenerOptions;

diff --git a/test/Listener/OnBootstrapListenerTest.php b/test/Listener/OnBootstrapListenerTest.php
@@ -11,17 +11,14 @@
 namespace ZendTest\ModuleManager\Listener;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Config\Config;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
 use Zend\Loader\AutoloaderFactory;
 use Zend\Loader\ModuleAutoloader;
-use Zend\ModuleManager\Listener\ListenerOptions;
 use Zend\ModuleManager\Listener\ModuleResolverListener;
 use Zend\ModuleManager\Listener\OnBootstrapListener;
 use Zend\ModuleManager\ModuleManager;
 use Zend\Mvc\Application;
-use Zend\Mvc\MvcEvent;
 use ZendTest\ModuleManager\TestAsset\MockApplication;
 
 class OnBootstrapListenerTest extends TestCase

diff --git a/test/ModuleManagerTest.php b/test/ModuleManagerTest.php
@@ -13,7 +13,6 @@
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\EventManager\EventManager;
 use Zend\Loader\AutoloaderFactory;
-use Zend\Loader\ModuleAutoloader;
 use Zend\ModuleManager\Listener\ListenerOptions;
 use Zend\ModuleManager\Listener\DefaultListenerAggregate;
 use Zend\ModuleManager\ModuleManager;

diff --git a/test/TestAsset/LoadOtherModule/Module.php b/test/TestAsset/LoadOtherModule/Module.php
@@ -10,7 +10,6 @@
 
 namespace LoadOtherModule;
 
-use Zend\Config\Config;
 
 class Module
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     namespace LoadOtherModule;
-    use Zend\Config\Config;
     class Module
     {
@@ Expand Down @@