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

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -13,7 +13,6 @@
 use ArrayAccess;
 use Countable;
 use Iterator;
-use Zend\Stdlib\ArrayUtils;
 
 /**
  * Provides a property based interface to an array.

diff --git a/test/Reader/AbstractReaderTestCase.php b/test/Reader/AbstractReaderTestCase.php
@@ -12,7 +12,6 @@
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Config\Reader\ReaderInterface;
-use ReflectionClass;
 
 /**
  * @category   Zend