change docblocks and comments that still using "Zend_" to "Zend\"

mnapoli · Apr 13, 2014 · b47fad8 · b47fad8
1 parent 35a4a30
commit b47fad8
Show file tree

Hide file tree

Showing 73 changed files with 104 additions and 111 deletions.
diff --git a/demos/Zend/ProgressBar/ZendForm.php b/demos/Zend/ProgressBar/ZendForm.php
@@ -15,8 +15,8 @@
 use Zend\ProgressBar\Adapter\JsPull;
 
 /**
- * This sample file demonstrates an advanced use case of Zend_ProgressBar with
- * Zend_Form and Zend_File_Transfer.
+ * This sample file demonstrates an advanced use case of Zend\ProgressBar with
+ * Zend\Form and Zend\File\Transfer.
  */
 
 require_once dirname(dirname(dirname(__DIR__))) . '/library/Zend/Loader/StandardAutoloader.php';

diff --git a/tests/ZendTest/Authentication/Adapter/Http/ApacheResolverTest.php b/tests/ZendTest/Authentication/Adapter/Http/ApacheResolverTest.php
@@ -37,14 +37,7 @@ class ApacheResolverTest extends \PHPUnit_Framework_TestCase
      * @var string
      */
     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/tests/ZendTest/Authentication/Adapter/Http/AuthTest.php b/tests/ZendTest/Authentication/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/tests/ZendTest/Authentication/Adapter/Http/FileResolverTest.php b/tests/ZendTest/Authentication/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/tests/ZendTest/Authentication/Adapter/Http/ProxyTest.php b/tests/ZendTest/Authentication/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;
 

diff --git a/tests/ZendTest/Captcha/ImageTest.php b/tests/ZendTest/Captcha/ImageTest.php
@@ -74,7 +74,7 @@ public function tearDown()
      * Determine system TMP directory
      *
      * @return string
-     * @throws Zend_File_Transfer_Exception if unable to determine directory
+     * @throws Zend\File\Transfer\Exception if unable to determine directory
      */
     protected function getTmpDir()
     {

diff --git a/tests/ZendTest/Filter/InflectorTest.php b/tests/ZendTest/Filter/InflectorTest.php
@@ -13,7 +13,7 @@
 use Zend\Filter\FilterPluginManager;
 
 /**
- * Test class for Zend_Filter_Inflector.
+ * Test class for Zend\Filter\Inflector.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/PregReplaceTest.php b/tests/ZendTest/Filter/PregReplaceTest.php
@@ -11,7 +11,7 @@
 use Zend\Filter\PregReplace as PregReplaceFilter;
 
 /**
- * Test class for Zend_Filter_PregReplace.
+ * Test class for Zend\Filter\PregReplace.
  *
  * @group Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/RealPathTest.php b/tests/ZendTest/Filter/RealPathTest.php
@@ -26,7 +26,7 @@ class RealPathTest extends \PHPUnit_Framework_TestCase
     /**
      * Zend_Filter_Basename object
      *
-     * @var Zend_Filter_Basename
+     * @var RealPathFilter
      */
     protected $_filter;
 

diff --git a/tests/ZendTest/Filter/StringToLowerTest.php b/tests/ZendTest/Filter/StringToLowerTest.php
@@ -19,7 +19,7 @@ class StringToLowerTest extends \PHPUnit_Framework_TestCase
     /**
      * Zend_Filter_StringToLower object
      *
-     * @var Zend_Filter_StringToLower
+     * @var StringToLowerFilter
      */
     protected $_filter;
 

diff --git a/tests/ZendTest/Filter/StringToUpperTest.php b/tests/ZendTest/Filter/StringToUpperTest.php
@@ -19,7 +19,7 @@ class StringToUpperTest extends \PHPUnit_Framework_TestCase
     /**
      * Zend_Filter_StringToLower object
      *
-     * @var Zend_Filter_StringToLower
+     * @var StringToUpperFilter
      */
     protected $_filter;
 

diff --git a/tests/ZendTest/Filter/StripTagsTest.php b/tests/ZendTest/Filter/StripTagsTest.php
@@ -19,7 +19,7 @@ class StripTagsTest extends \PHPUnit_Framework_TestCase
     /**
      * Zend_Filter_StripTags object
      *
-     * @var Zend_Filter_StripTags
+     * @var StripTagsFilter
      */
     protected $_filter;
 

diff --git a/tests/ZendTest/Filter/Word/CamelCaseToDashTest.php b/tests/ZendTest/Filter/Word/CamelCaseToDashTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\CamelCaseToDash as CamelCaseToDashFilter;
 
 /**
- * Test class for Zend_Filter_Word_CamelCaseToDash.
+ * Test class for Zend\Filter\Word\CamelCaseToDash.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/CamelCaseToSeparatorTest.php b/tests/ZendTest/Filter/Word/CamelCaseToSeparatorTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\CamelCaseToSeparator as CamelCaseToSeparatorFilter;
 
 /**
- * Test class for Zend_Filter_Word_CamelCaseToSeparator.
+ * Test class for Zend\Filter\Word\CamelCaseToSeparator.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/DashToCamelCaseTest.php b/tests/ZendTest/Filter/Word/DashToCamelCaseTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\DashToCamelCase as DashToCamelCaseFilter;
 
 /**
- * Test class for Zend_Filter_Word_DashToCamelCase.
+ * Test class for Zend\Filter\Word\DashToCamelCase.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/DashToSeparatorTest.php b/tests/ZendTest/Filter/Word/DashToSeparatorTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\DashToSeparator as DashToSeparatorFilter;
 
 /**
- * Test class for Zend_Filter_Word_DashToSeparator.
+ * Test class for Zend\Filter\Word\DashToSeparator.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/DashToUnderscoreTest.php b/tests/ZendTest/Filter/Word/DashToUnderscoreTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\DashToUnderscore as DashToUnderscoreFilter;
 
 /**
- * Test class for Zend_Filter_Word_DashToUnderscore.
+ * Test class for Zend\Filter\Word\DashToUnderscore.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/SeparatorToCamelCaseTest.php b/tests/ZendTest/Filter/Word/SeparatorToCamelCaseTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\SeparatorToCamelCase as SeparatorToCamelCaseFilter;
 
 /**
- * Test class for Zend_Filter_Word_SeparatorToCamelCase.
+ * Test class for Zend\Filter\Word\SeparatorToCamelCase.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/SeparatorToDashTest.php b/tests/ZendTest/Filter/Word/SeparatorToDashTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\SeparatorToDash as SeparatorToDashFilter;
 
 /**
- * Test class for Zend_Filter_Word_SeparatorToDash.
+ * Test class for Zend\Filter\Word\SeparatorToDash.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/SeparatorToSeparatorTest.php b/tests/ZendTest/Filter/Word/SeparatorToSeparatorTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\SeparatorToSeparator as SeparatorToSeparatorFilter;
 
 /**
- * Test class for Zend_Filter_Word_SeparatorToSeparator.
+ * Test class for Zend\Filter\Word\SeparatorToSeparator.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/UnderscoreToCamelCaseTest.php b/tests/ZendTest/Filter/Word/UnderscoreToCamelCaseTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\UnderscoreToCamelCase as UnderscoreToCamelCaseFilter;
 
 /**
- * Test class for Zend_Filter_Word_UnderscoreToCamelCase.
+ * Test class for Zend\Filter\Word\UnderscoreToCamelCase.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/UnderscoreToDashTest.php b/tests/ZendTest/Filter/Word/UnderscoreToDashTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\UnderscoreToDash as UnderscoreToDashFilter;
 
 /**
- * Test class for Zend_Filter_Word_UnderscoreToDash.
+ * Test class for Zend\Filter\Word\UnderscoreToDash.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/Filter/Word/UnderscoreToSeparatorTest.php b/tests/ZendTest/Filter/Word/UnderscoreToSeparatorTest.php
@@ -12,7 +12,7 @@
 use Zend\Filter\Word\UnderscoreToSeparator as UnderscoreToSeparatorFilter;
 
 /**
- * Test class for Zend_Filter_Word_UnderscoreToSeparator.
+ * Test class for Zend\Filter\Word\UnderscoreToSeparator.
  *
  * @group      Zend_Filter
  */

diff --git a/tests/ZendTest/I18n/View/Helper/DateFormatTest.php b/tests/ZendTest/I18n/View/Helper/DateFormatTest.php
@@ -15,7 +15,7 @@
 use Zend\I18n\View\Helper\DateFormat as DateFormatHelper;
 
 /**
- * Test class for Zend_View_Helper_Currency
+ * Test class for Zend\View\Helper\Currency
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/tests/ZendTest/I18n/View/Helper/NumberFormatTest.php b/tests/ZendTest/I18n/View/Helper/NumberFormatTest.php
@@ -14,7 +14,7 @@
 use Zend\I18n\View\Helper\NumberFormat as NumberFormatHelper;
 
 /**
- * Test class for Zend_View_Helper_Currency
+ * Test class for Zend\View\Helper\Currency
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/tests/ZendTest/Json/JsonTest.php b/tests/ZendTest/Json/JsonTest.php
@@ -553,7 +553,7 @@ public function testToJSONWithExpr()
     }
 
     /**
-     * Regression tests for Zend_JSON_Expr and multiple keys with the same name.
+     * Regression tests for Zend\Json\Expr and multiple keys with the same name.
      *
      * @group ZF-4946
      */

diff --git a/tests/ZendTest/Json/Server/CacheTest.php b/tests/ZendTest/Json/Server/CacheTest.php
@@ -12,7 +12,7 @@
 use Zend\Json\Server;
 
 /**
- * Test class for Zend_JSON_Server_Cache
+ * Test class for Zend\JSON\Server\Cache
  *
  * @group      Zend_JSON
  * @group      Zend_JSON_Server

diff --git a/tests/ZendTest/Json/Server/ErrorTest.php b/tests/ZendTest/Json/Server/ErrorTest.php
@@ -13,7 +13,7 @@
 use Zend\Json;
 
 /**
- * Test class for Zend_JSON_Server_Error
+ * Test class for Zend\JSON\Server\Error
  *
  * @group      Zend_JSON
  * @group      Zend_JSON_Server

diff --git a/tests/ZendTest/Json/Server/ResponseTest.php b/tests/ZendTest/Json/Server/ResponseTest.php
@@ -13,7 +13,7 @@
 use Zend\Json;
 
 /**
- * Test class for Zend_JSON_Server_Response
+ * Test class for Zend\JSON\Server\Response
  *
  * @group      Zend_JSON
  * @group      Zend_JSON_Server

diff --git a/tests/ZendTest/Json/Server/Smd/ServiceTest.php b/tests/ZendTest/Json/Server/Smd/ServiceTest.php
@@ -13,7 +13,7 @@
 use Zend\Json\Server;
 
 /**
- * Test class for Zend_JSON_Server_Smd_Service
+ * Test class for Zend\JSON\Server\Smd\Service
  *
  * @group      Zend_JSON
  * @group      Zend_JSON_Server

diff --git a/tests/ZendTest/Json/Server/SmdTest.php b/tests/ZendTest/Json/Server/SmdTest.php
@@ -16,7 +16,7 @@
 use Zend\Json;
 
 /**
- * Test class for Zend_JSON_Server_Smd
+ * Test class for Zend\JSON\Server\Smd
  *
  * @group      Zend_Json
  * @group      Zend_Json_Server

diff --git a/tests/ZendTest/Json/ServerTest.php b/tests/ZendTest/Json/ServerTest.php
@@ -17,7 +17,7 @@
 require_once __DIR__ . '/TestAsset/FooFunc.php';
 
 /**
- * Test class for Zend_JSON_Server
+ * Test class for Zend\Json\Server
  *
  * @group      Zend_JSON
  * @group      Zend_JSON_Server

diff --git a/tests/ZendTest/Memory/MovableTest.php b/tests/ZendTest/Memory/MovableTest.php
@@ -137,7 +137,7 @@ class DummyMemoryManager extends Memory\MemoryManager
     /** @var integer */
     public $processedId;
 
-    /** @var Zend_Memory_Container_Movable */
+    /** @var Container\Movable */
     public $processedObject;
 
     /**

diff --git a/tests/ZendTest/Mime/PartTest.php b/tests/ZendTest/Mime/PartTest.php
@@ -19,7 +19,7 @@ class PartTest extends \PHPUnit_Framework_TestCase
     /**
      * MIME part test object
      *
-     * @var Zend_Mime_Part
+     * @var Zend\Mime\Part
      */
     protected $part = null;
     protected $testText;

diff --git a/tests/ZendTest/Permissions/Acl/AclTest.php b/tests/ZendTest/Permissions/Acl/AclTest.php
@@ -21,7 +21,7 @@ class AclTest extends \PHPUnit_Framework_TestCase
     /**
      * ACL object for each test method
      *
-     * @var Zend_Acl
+     * @var Acl\Acl
      */
     protected $_acl;
 

diff --git a/tests/ZendTest/Soap/AutoDiscoverTest.php b/tests/ZendTest/Soap/AutoDiscoverTest.php
@@ -19,7 +19,7 @@
 /** PHPUnit Test Case */
 
 /**
- * Test cases for Zend_Soap_AutoDiscover
+ * Test cases for Zend\Soap\AutoDiscover
  *
  * @group      Zend_Soap
  */

diff --git a/tests/ZendTest/Soap/TestAsset/commontypes.php b/tests/ZendTest/Soap/TestAsset/commontypes.php
@@ -540,7 +540,7 @@ class TestLocalSoapClient extends \SoapClient
     /**
      * Server object
      *
-     * @var Zend_Soap_Server
+     * @var \Zend\Soap\Server
      */
     public $server;
 

diff --git a/tests/ZendTest/Soap/_files/fulltests/server1.php b/tests/ZendTest/Soap/_files/fulltests/server1.php
@@ -58,10 +58,10 @@ class Zend_Soap_Wsdl_ComplexTypeA
 }
 
 if (isset($_GET['wsdl'])) {
-    $server = new Zend_Soap_AutoDiscover(new Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex());
+    $server = new Zend\Soap\AutoDiscover(new Zend\Soap\Wsdl\Strategy\ArrayOfTypeComplex());
 } else {
     $uri = "http://".$_SERVER['HTTP_HOST']."/".$_SERVER['PHP_SELF']."?wsdl";
-    $server = new Zend_Soap_Server($uri);
+    $server = new Zend\Soap\Server($uri);
 }
 $server->setClass('Zend_Soap_Service_Server1');
 $server->handle();
diff --git a/tests/ZendTest/View/Helper/CycleTest.php b/tests/ZendTest/View/Helper/CycleTest.php
@@ -12,15 +12,15 @@
 use Zend\View\Helper;
 
 /**
- * Test class for Zend_View_Helper_Cycle.
+ * Test class for Zend\View\Helper\Cycle.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class CycleTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_Cycle
+     * @var Helper\Cycle
      */
     public $helper;
 

diff --git a/tests/ZendTest/View/Helper/DoctypeTest.php b/tests/ZendTest/View/Helper/DoctypeTest.php
@@ -12,7 +12,7 @@
 use Zend\View\Helper;
 
 /**
- * Test class for Zend_View_Helper_Doctype.
+ * Test class for Zend\View\Helper\Doctype.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/tests/ZendTest/View/Helper/FlashMessengerTest.php b/tests/ZendTest/View/Helper/FlashMessengerTest.php
@@ -19,7 +19,7 @@
 use ZendTest\Session\TestAsset\TestManager as SessionManager;
 
 /**
- * Test class for Zend_View_Helper_Cycle.
+ * Test class for Zend\View\Helper\Cycle.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
-Original file line number
+Diff line change
@@ Expand Up / @@ -553,7 +553,7 @@ public function testToJSONWithExpr() @@
         }
         /**
-         * Regression tests for Zend_JSON_Expr and multiple keys with the same name.
+         * Regression tests for Zend\Json\Expr and multiple keys with the same name.
          *
          * @group ZF-4946
          */
@@ Expand Down @@