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 · 84e6810 · 84e6810
commit 84e6810
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/test/Definition/RuntimeDefinitionTest.php b/test/Definition/RuntimeDefinitionTest.php
@@ -10,7 +10,6 @@
 
 namespace ZendTest\Di\Definition;
 
-use Zend\Di\Definition\RuntimeDefinition;
 use PHPUnit_Framework_TestCase as TestCase;
 
 class RuntimeDefinitionTest extends TestCase

diff --git a/test/DefinitionListTest.php b/test/DefinitionListTest.php
@@ -12,7 +12,6 @@
 
 use Zend\Di\DefinitionList;
 use Zend\Di\Definition\ClassDefinition;
-use Zend\Di\Definition\RuntimeDefinition;
 
 use PHPUnit_Framework_TestCase as TestCase;