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

…placement' Close zendframework/zendframework#6130
zendframework · Apr 13, 2014 · 989a8de · 989a8de
3 parents d6cd012 + 0186e83 + 1beb363
commit 989a8de
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -23,17 +23,17 @@
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_Http_Client_Adapter_Abstract
+     * @var \Zend\Http\Client\Adapter\AdapterInterface
      */
     protected $httpAdapter;
 
     /**
-     * @var Zend_Http_Client
+     * @var \Zend\Http\Client
      */
     protected $httpClient;
 
     /**
-     * @var Zend_XmlRpc_Client
+     * @var \Zend\XmlRpc\Client
      */
     protected $xmlrpcClient;
 

diff --git a/test/FaultTest.php b/test/FaultTest.php
@@ -169,7 +169,7 @@ public function testLoadXmlThrowsExceptionOnInvalidInput4()
     }
 
     /**
-     * Zend_XmlRpc_Fault::isFault() test
+     * Zend\XmlRpc\Fault::isFault() test
      */
     public function testIsFault()
     {

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -19,8 +19,8 @@
 class RequestTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Zend_XmlRpc_Request object
-     * @var Zend_XmlRpc_Request
+     * \Zend\XmlRpc\Request object
+     * @var \Zend\XmlRpc\Request
      */
     protected $_request;
 

diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -18,8 +18,8 @@
 class ResponseTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Zend_XmlRpc_Response object
-     * @var Zend_XmlRpc_Response
+     * Response object
+     * @var Response
      */
     protected $_response;
 

diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
@@ -17,8 +17,8 @@
 class CacheTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Zend_XmlRpc_Server object
-     * @var Zend_XmlRpc_Server
+     * Server object
+     * @var Server
      */
     protected $_server;
 

diff --git a/test/Server/FaultTest.php b/test/Server/FaultTest.php
@@ -69,7 +69,7 @@ public function testAttachFaultExceptionAllowsForDerivativeExceptionClasses()
     }
 
     /**
-     * Zend_XmlRpc_Server_Fault::detachFaultException() test
+     * Zend\XmlRpc\Server\Fault::detachFaultException() test
      */
     public function testDetachFaultException()
     {
@@ -106,7 +106,7 @@ public function testDetachFaultException()
     }
 
     /**
-     * Zend_XmlRpc_Server_Fault::attachObserver() test
+     * Zend\XmlRpc\Server\Fault::attachObserver() test
      */
     public function testAttachObserver()
     {

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -23,8 +23,8 @@
 class ServerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Zend_XmlRpc_Server object
-     * @var Zend_XmlRpc_Server
+     * Server object
+     * @var Server
      */
     protected $_server;
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,7 +169,7 @@ public function testLoadXmlThrowsExceptionOnInvalidInput4() @@
         }
         /**
-         * Zend_XmlRpc_Fault::isFault() test
+         * Zend\XmlRpc\Fault::isFault() test
          */
         public function testIsFault()
         {
@@ Expand Down @@