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 · 9379ad6 · 9379ad6
4 parents 8d3732a + a883a8d + 4aa93a8 + 09c50b4
commit 9379ad6
Show file tree

Hide file tree

Showing 28 changed files with 52 additions and 52 deletions.
diff --git a/test/Helper/CycleTest.php b/test/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/test/Helper/DoctypeTest.php b/test/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/test/Helper/FlashMessengerTest.php b/test/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

diff --git a/test/Helper/HeadLinkTest.php b/test/Helper/HeadLinkTest.php
@@ -14,15 +14,15 @@
 use Zend\View\Exception\ExceptionInterface as ViewException;
 
 /**
- * Test class for Zend_View_Helper_HeadLink.
+ * Test class for Zend\View\Helper\HeadLink.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class HeadLinkTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HeadLink
+     * @var Helper\HeadLink
      */
     public $helper;
 

diff --git a/test/Helper/HeadMetaTest.php b/test/Helper/HeadMetaTest.php
@@ -14,15 +14,15 @@
 use Zend\View\Exception\ExceptionInterface as ViewException;
 
 /**
- * Test class for Zend_View_Helper_HeadMeta.
+ * Test class for Zend\View\Helper\HeadMeta.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class HeadMetaTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HeadMeta
+     * @var Helper\HeadMeta
      */
     public $helper;
 

diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php
@@ -13,15 +13,15 @@
 use Zend\View;
 
 /**
- * Test class for Zend_View_Helper_HeadScript.
+ * Test class for Zend\View\Helper\HeadScript.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class HeadScriptTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HeadScript
+     * @var Helper\HeadScript
      */
     public $helper;
 

diff --git a/test/Helper/HeadStyleTest.php b/test/Helper/HeadStyleTest.php
@@ -13,15 +13,15 @@
 use Zend\View;
 
 /**
- * Test class for Zend_View_Helper_HeadStyle.
+ * Test class for Zend\View\Helper\HeadStyle.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class HeadStyleTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HeadStyle
+     * @var Helper\HeadStyle
      */
     public $helper;
 

diff --git a/test/Helper/HeadTitleTest.php b/test/Helper/HeadTitleTest.php
@@ -13,15 +13,15 @@
 use Zend\View\Helper;
 
 /**
- * Test class for Zend_View_Helper_HeadTitle.
+ * Test class for Zend\View\Helper\HeadTitle.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class HeadTitleTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HeadTitle
+     * @var Helper\HeadTitle
      */
     public $helper;
 

diff --git a/test/Helper/HtmlFlashTest.php b/test/Helper/HtmlFlashTest.php
@@ -19,7 +19,7 @@
 class HtmlFlashTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HtmlFlash
+     * @var HtmlFlash
      */
     public $helper;
 

diff --git a/test/Helper/HtmlListTest.php b/test/Helper/HtmlListTest.php
@@ -19,7 +19,7 @@
 class HtmlListTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HtmlList
+     * @var Helper\HtmlList
      */
     public $helper;
 

diff --git a/test/Helper/HtmlObjectTest.php b/test/Helper/HtmlObjectTest.php
@@ -20,7 +20,7 @@
 class HtmlObjectTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HtmlObject
+     * @var HtmlObject
      */
     public $helper;
 

diff --git a/test/Helper/HtmlPageTest.php b/test/Helper/HtmlPageTest.php
@@ -19,7 +19,7 @@
 class HtmlPageTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HtmlPage
+     * @var HtmlPage
      */
     public $helper;
 

diff --git a/test/Helper/HtmlQuicktimeTest.php b/test/Helper/HtmlQuicktimeTest.php
@@ -19,7 +19,7 @@
 class HtmlQuicktimeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_HtmlQuicktime
+     * @var HtmlQuicktime
      */
     public $helper;
 

diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php
@@ -13,15 +13,15 @@
 
 
 /**
- * Test class for Zend_View_Helper_InlineScript.
+ * Test class for Zend\View\Helper\InlineScript.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
 class InlineScriptTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Zend_View_Helper_InlineScript
+     * @var Helper\InlineScript
      */
     public $helper;
 

diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php
@@ -15,7 +15,7 @@
 use Zend\View\Helper\Json as JsonHelper;
 
 /**
- * Test class for Zend_View_Helper_Json
+ * Test class for Zend\View\Helper\Json
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/test/Helper/LayoutTest.php b/test/Helper/LayoutTest.php
@@ -14,7 +14,7 @@
 use Zend\View\Renderer\PhpRenderer;
 
 /**
- * Test class for Zend_View_Helper_Layout
+ * Test class for Zend\View\Helper\Layout
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php
@@ -53,14 +53,14 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase
     /**
      * View helper
      *
-     * @var Zend\View\Helper\Navigation\AbstractHelper
+     * @var \Zend\View\Helper\Navigation\AbstractHelper
      */
     protected $_helper;
 
     /**
      * The first container in the config file (files/navigation.xml)
      *
-     * @var Zend_Navigation
+     * @var Navigation
      */
     protected $_nav1;
 

diff --git a/test/Helper/Navigation/BreadcrumbsTest.php b/test/Helper/Navigation/BreadcrumbsTest.php
@@ -13,7 +13,7 @@
 use Zend\View\Exception\ExceptionInterface;
 
 /**
- * Tests Zend_View_Helper_Navigation_Breadcrumbs
+ * Tests Zend\View\Helper\Navigation\Breadcrumbs
  *
  * @group      Zend_View
  * @group      Zend_View_Helper

diff --git a/test/Helper/Navigation/LinksTest.php b/test/Helper/Navigation/LinksTest.php
@@ -19,7 +19,7 @@
 use Zend\View\Helper\Navigation;
 
 /**
- * Tests Zend_View_Helper_Navigation_Links
+ * Tests Zend\View\Helper\Navigation\Links
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
@@ -36,7 +36,7 @@ class LinksTest extends AbstractTest
     /**
      * View helper
      *
-     * @var Zend\View\Helper\Navigation\Links
+     * @var \Zend\View\Helper\Navigation\Links
      */
     protected $_helper;
 
@@ -527,7 +527,7 @@ public function testFindRelationMustSpecifyRelOrRev()
         try {
             $this->_helper->findRelation($active, 'foo', 'bar');
             $this->fail('An invalid value was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('Invalid argument: $rel', $e->getMessage());
         }
@@ -539,7 +539,7 @@ public function testRenderLinkMustSpecifyRelOrRev()
         try {
             $this->_helper->renderLink($active, 'foo', 'bar');
             $this->fail('An invalid value was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('Invalid relation attribute', $e->getMessage());
         }

diff --git a/test/Helper/Navigation/MenuTest.php b/test/Helper/Navigation/MenuTest.php
@@ -10,7 +10,7 @@
 namespace ZendTest\View\Helper\Navigation;
 
 /**
- * Tests Zend_View_Helper_Navigation_Menu
+ * Tests Zend\View\Helper\Navigation\Menu
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
@@ -27,7 +27,7 @@ class MenuTest extends AbstractTest
     /**
      * View helper
      *
-     * @var Zend_View_Helper_Navigation_Menu
+     * @var \Zend\View\Helper\Navigation\Menu
      */
     protected $_helper;
 
@@ -285,7 +285,7 @@ public function testRenderingPartialShouldFailOnInvalidPartialArray()
 
         try {
             $this->_helper->render();
-            $this->fail('invalid $partial should throw Zend_View_Exception');
+            $this->fail('invalid $partial should throw Zend\View\Exception\InvalidArgumentException');
         } catch (\Zend\View\Exception\ExceptionInterface $e) {
         }
     }

diff --git a/test/Helper/Navigation/NavigationTest.php b/test/Helper/Navigation/NavigationTest.php
@@ -18,7 +18,7 @@
 use Zend\View\Renderer\PhpRenderer;
 
 /**
- * Tests Zend_View_Helper_Navigation
+ * Tests Zend\View\Helper\Navigation
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
@@ -35,7 +35,7 @@ class NavigationTest extends AbstractTest
     /**
      * View helper
      *
-     * @var Zend\View\Helper\Navigation
+     * @var \Zend\View\Helper\Navigation
      */
     protected $_helper;
 
@@ -305,7 +305,7 @@ public function testSetRoleThrowsExceptionWhenGivenAnInt()
         try {
             $this->_helper->setRole(1337);
             $this->fail('An invalid argument was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('$role must be a string', $e->getMessage());
         }
@@ -316,7 +316,7 @@ public function testSetRoleThrowsExceptionWhenGivenAnArbitraryObject()
         try {
             $this->_helper->setRole(new \stdClass());
             $this->fail('An invalid argument was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('$role must be a string', $e->getMessage());
         }
@@ -357,7 +357,7 @@ public function testSetDefaultRoleThrowsExceptionWhenGivenAnInt()
         try {
             Navigation\AbstractHelper::setDefaultRole(1337);
             $this->fail('An invalid argument was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('$role must be', $e->getMessage());
         }
@@ -368,7 +368,7 @@ public function testSetDefaultRoleThrowsExceptionWhenGivenAnArbitraryObject()
         try {
             Navigation\AbstractHelper::setDefaultRole(new \stdClass());
             $this->fail('An invalid argument was given, but a ' .
-                        'Zend_View_Exception was not thrown');
+                        'Zend\View\Exception\InvalidArgumentException was not thrown');
         } catch (View\Exception\ExceptionInterface $e) {
             $this->assertContains('$role must be', $e->getMessage());
         }

diff --git a/test/Helper/Navigation/SitemapTest.php b/test/Helper/Navigation/SitemapTest.php
@@ -13,7 +13,7 @@
 use Zend\View;
 
 /**
- * Tests Zend_View_Helper_Navigation_Sitemap
+ * Tests Zend\View\Helper\Navigation\Sitemap
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
@@ -32,7 +32,7 @@ class SitemapTest extends AbstractTest
     /**
      * View helper
      *
-     * @var Zend_View_Helper_Navigation_Sitemap
+     * @var \Zend\View\Helper\Navigation\Sitemap
      */
     protected $_helper;
 
@@ -185,7 +185,7 @@ public function testThrowExceptionOnInvalidLoc()
             return;
         }
 
-        $this->fail('A Zend_View_Exception was not thrown on invalid <loc />');
+        $this->fail('A Zend\View\Exception\InvalidArgumentException was not thrown on invalid <loc />');
     }
 
     public function testDisablingValidators()
@@ -260,6 +260,6 @@ public function testUseSchemaValidation()
             return;
         }
 
-        $this->fail('A Zend_View_Exception was not thrown when using Schema validation');
+        $this->fail('A Zend\View\Exception\InvalidArgumentException was not thrown when using Schema validation');
     }
 }
diff --git a/test/Helper/PartialLoopTest.php b/test/Helper/PartialLoopTest.php
@@ -16,7 +16,7 @@
 use Zend\View\Renderer\PhpRenderer as View;
 
 /**
- * Test class for Zend_View_Helper_PartialLoop.
+ * Test class for Zend\View\Helper\PartialLoop.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper