Forward port zendframework/zendframework#5672

Conflicts: library/Zend/EventManager/EventManagerAwareTrait.php library/Zend/Form/View/Helper/FormRow.php library/Zend/I18n/Translator/TranslatorAwareTrait.php library/Zend/Stdlib/Hydrator/AbstractHydrator.php tests/.php_cs tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php tests/ZendTest/Loader/AutoloadableClass.php tests/ZendTest/Loader/MyLoader.php tests/ZendTest/Loader/MyOverloader.php tests/ZendTest/Loader/TestAsset/UnMappedClass.php tests/ZendTest/Version/VersionTest.php tests/ZendTest/View/_stubs/FilterDir1/Foo.php tests/ZendTest/View/_stubs/HelperDir1/Stub1.php tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php tests/ZendTest/View/_stubs/HelperDir2/Datetime.php tests/ZendTest/View/_stubs/HelperDir2/Stub1.php tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
zendframework · Jan 4, 2014 · 4434ad7 · 4434ad7
commit 4434ad7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/Config/StandardConfig.php b/src/Config/StandardConfig.php
@@ -10,7 +10,6 @@
 namespace Zend\Session\Config;
 
 use Traversable;
-use Zend\Session\Config\ConfigInterface;
 use Zend\Session\Exception;
 use Zend\Validator\Hostname as HostnameValidator;
 

diff --git a/test/Config/SessionConfigTest.php b/test/Config/SessionConfigTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Session;
+namespace ZendTest\Session\Config;
 
 use Zend\Session\Config\SessionConfig;
 

diff --git a/test/Config/StandardConfigTest.php b/test/Config/StandardConfigTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Session;
+namespace ZendTest\Session\Config;
 
 use Zend\Session\Config\StandardConfig;