Merge branch 'cs/zendframework/zendframework#6130-Zend_-classnames-re…

…placement' into develop Close zendframework/zendframework#6130 Forward Port zendframework/zendframework#6130
zendframework · Apr 13, 2014 · cef7726 · cef7726
4 parents 223cfff + 4e9baee + c1bb548 + 3f3c2ff
commit cef7726
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/test/Adapter/Http/ApacheResolverTest.php b/test/Adapter/Http/ApacheResolverTest.php
@@ -38,13 +38,6 @@ class ApacheResolverTest extends \PHPUnit_Framework_TestCase
      */
     protected $_badPath;
 
-    /**
-     * Resolver instance
-     *
-     * @var Zend_Auth_Adapter_Http_Resolver_File
-     */
-    protected $_resolver;
-
     /**
      * Sets the paths to files used in this test, and creates a shared resolver instance
      * having a valid path.

diff --git a/test/Adapter/Http/AuthTest.php b/test/Adapter/Http/AuthTest.php
@@ -57,7 +57,7 @@ class AuthTest extends \PHPUnit_Framework_TestCase
     /**
      * File resolver setup against with HTTP Digest auth file
      *
-     * @var Zend_Auth_Adapter_Http_Resolver_File
+     * @var Http\FileResolver
      */
     protected $_digestResolver;
 

diff --git a/test/Adapter/Http/FileResolverTest.php b/test/Adapter/Http/FileResolverTest.php
@@ -40,7 +40,7 @@ class FileResolverTest extends \PHPUnit_Framework_TestCase
     /**
      * Resolver instance
      *
-     * @var Zend_Auth_Adapter_Http_Resolver_File
+     * @var Http\FileResolver
      */
     protected $_resolver;
 

diff --git a/test/Adapter/Http/ProxyTest.php b/test/Adapter/Http/ProxyTest.php
@@ -50,14 +50,14 @@ class ProxyTest extends \PHPUnit_Framework_TestCase
     /**
      * File resolver setup against with HTTP Basic auth file
      *
-     * @var Zend_Auth_Adapter_Http_Resolver_File
+     * @var Http\FileResolver
      */
     protected $_basicResolver;
 
     /**
      * File resolver setup against with HTTP Digest auth file
      *
-     * @var Zend_Auth_Adapter_Http_Resolver_File
+     * @var Http\FileResolver
      */
     protected $_digestResolver;