Merge branch 'feature/115' into develop

weierophinney · weierophinney · commit f63631979754 · 2017-03-21T08:28:14.000-05:00
Close #115
diff --git a/test/Helper/CycleTest.php b/test/Helper/CycleTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 
 /**
@@ -17,7 +18,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class CycleTest extends \PHPUnit\Framework\TestCase
+class CycleTest extends TestCase
 {
     /**
      * @var Helper\Cycle
diff --git a/test/Helper/DeclareVarsTest.php b/test/Helper/DeclareVarsTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\DeclareVars;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class DeclareVarsTest extends \PHPUnit\Framework\TestCase
+class DeclareVarsTest extends TestCase
 {
     public function setUp()
     {
diff --git a/test/Helper/DoctypeTest.php b/test/Helper/DoctypeTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 
 /**
@@ -17,7 +18,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class DoctypeTest extends \PHPUnit\Framework\TestCase
+class DoctypeTest extends TestCase
 {
     /**
      * @var Helper\Doctype
diff --git a/test/Helper/HeadScriptTest.php b/test/Helper/HeadScriptTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 use Zend\View;
 
@@ -18,7 +19,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HeadScriptTest extends \PHPUnit\Framework\TestCase
+class HeadScriptTest extends TestCase
 {
     /**
      * @var Helper\HeadScript
diff --git a/test/Helper/HeadStyleTest.php b/test/Helper/HeadStyleTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 use Zend\View;
 
@@ -18,7 +19,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HeadStyleTest extends \PHPUnit\Framework\TestCase
+class HeadStyleTest extends TestCase
 {
     /**
      * @var Helper\HeadStyle
diff --git a/test/Helper/HeadTitleTest.php b/test/Helper/HeadTitleTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\I18n\Translator\Translator;
 use Zend\View\Helper;
 
@@ -18,7 +19,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HeadTitleTest extends \PHPUnit\Framework\TestCase
+class HeadTitleTest extends TestCase
 {
     /**
      * @var Helper\HeadTitle
diff --git a/test/Helper/HtmlFlashTest.php b/test/Helper/HtmlFlashTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\HtmlFlash;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HtmlFlashTest extends \PHPUnit\Framework\TestCase
+class HtmlFlashTest extends TestCase
 {
     /**
      * @var HtmlFlash
diff --git a/test/Helper/HtmlObjectTest.php b/test/Helper/HtmlObjectTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\Doctype;
 use Zend\View\Helper\HtmlObject;
@@ -17,7 +18,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HtmlObjectTest extends \PHPUnit\Framework\TestCase
+class HtmlObjectTest extends TestCase
 {
     /**
      * @var HtmlObject
diff --git a/test/Helper/HtmlPageTest.php b/test/Helper/HtmlPageTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\HtmlPage;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HtmlPageTest extends \PHPUnit\Framework\TestCase
+class HtmlPageTest extends TestCase
 {
     /**
      * @var HtmlPage
diff --git a/test/Helper/HtmlQuicktimeTest.php b/test/Helper/HtmlQuicktimeTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\HtmlQuicktime;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HtmlQuicktimeTest extends \PHPUnit\Framework\TestCase
+class HtmlQuicktimeTest extends TestCase
 {
     /**
      * @var HtmlQuicktime
diff --git a/test/Helper/HtmlTagTest.php b/test/Helper/HtmlTagTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper\HtmlTag;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class HtmlTagTest extends \PHPUnit\Framework\TestCase
+class HtmlTagTest extends TestCase
 {
     /**
      * @var HtmlTag
diff --git a/test/Helper/IdentityTest.php b/test/Helper/IdentityTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Authentication\AuthenticationService;
 use Zend\Authentication\Storage\NonPersistent as NonPersistentStorage;
 use Zend\View\Helper\Identity as IdentityHelper;
@@ -21,7 +22,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class IdentityTest extends \PHPUnit\Framework\TestCase
+class IdentityTest extends TestCase
 {
     public function testGetIdentity()
     {
diff --git a/test/Helper/InlineScriptTest.php b/test/Helper/InlineScriptTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 
 /**
@@ -17,7 +18,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class InlineScriptTest extends \PHPUnit\Framework\TestCase
+class InlineScriptTest extends TestCase
 {
     /**
      * @var Helper\InlineScript
diff --git a/test/Helper/Navigation/AbstractTest.php b/test/Helper/Navigation/AbstractTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper\Navigation;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Navigation\Navigation;
 use Zend\Config\Factory as ConfigFactory;
 use Zend\Mvc\Router\RouteMatch as V2RouteMatch;
@@ -27,7 +28,7 @@
 /**
  * Base class for navigation view helper tests
  */
-abstract class AbstractTest extends \PHPUnit\Framework\TestCase
+abstract class AbstractTest extends TestCase
 {
     /**
      * @var
diff --git a/test/Helper/Placeholder/ContainerTest.php b/test/Helper/Placeholder/ContainerTest.php
@@ -9,13 +9,15 @@
 
 namespace ZendTest\View\Helper\Placeholder;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test class for Zend\View\Helper\Placeholder\Container.
  *
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class ContainerTest extends \PHPUnit\Framework\TestCase
+class ContainerTest extends TestCase
 {
     /**
      * @var \Zend\View\Helper\Placeholder\Container
diff --git a/test/Helper/Placeholder/RegistryTest.php b/test/Helper/Placeholder/RegistryTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper\Placeholder;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper\Placeholder\Registry;
 use Zend\View\Helper\Placeholder\Container;
 
@@ -18,7 +19,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class RegistryTest extends \PHPUnit\Framework\TestCase
+class RegistryTest extends TestCase
 {
     /**
      * @var Registry
diff --git a/test/Helper/Placeholder/StandaloneContainerTest.php b/test/Helper/Placeholder/StandaloneContainerTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper\Placeholder;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper\Placeholder\Container;
 use Zend\View\Renderer\PhpRenderer as View;
 use ZendTest\View\Helper\TestAsset\Foo;
@@ -19,7 +20,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class StandaloneContainerTest extends \PHPUnit\Framework\TestCase
+class StandaloneContainerTest extends TestCase
 {
     /**
      * @var Foo
diff --git a/test/Helper/PlaceholderTest.php b/test/Helper/PlaceholderTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 use Zend\View\Helper;
 
@@ -18,7 +19,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class PlaceholderTest extends \PHPUnit\Framework\TestCase
+class PlaceholderTest extends TestCase
 {
     /**
      * @var Helper\Placeholder
diff --git a/test/Helper/RenderToPlaceholderTest.php b/test/Helper/RenderToPlaceholderTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Renderer\PhpRenderer as View;
 
 /**
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class RenderToPlaceholderTest extends \PHPUnit\Framework\TestCase
+class RenderToPlaceholderTest extends TestCase
 {
     // @codingStandardsIgnoreStart
     protected $_view = null;
diff --git a/test/Helper/ServerUrlTest.php b/test/Helper/ServerUrlTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Helper;
 
 /**
@@ -17,7 +18,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class ServerUrlTest extends \PHPUnit\Framework\TestCase
+class ServerUrlTest extends TestCase
 {
     /**
      * Back up of $_SERVER
diff --git a/test/Helper/UrlIntegrationTest.php b/test/Helper/UrlIntegrationTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\View\Helper;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Console\Console;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Mvc\Console\ConfigProvider as MvcConsoleConfigProvider;
@@ -25,7 +26,7 @@
  * @group      Zend_View
  * @group      Zend_View_Helper
  */
-class UrlIntegrationTest extends \PHPUnit\Framework\TestCase
+class UrlIntegrationTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/test/Resolver/PrefixPathStackResolverTest.php b/test/Resolver/PrefixPathStackResolverTest.php
@@ -9,14 +9,15 @@
 
 namespace ZendTest\View\Resolver;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Resolver\PrefixPathStackResolver;
 
 /**
  * Tests for {@see \Zend\View\Resolver\PrefixPathStackResolver}
  *
  * @covers \Zend\View\Resolver\PrefixPathStackResolver
  */
-class PrefixPathStackResolverTest extends \PHPUnit\Framework\TestCase
+class PrefixPathStackResolverTest extends TestCase
 {
     /**
      * @var string
diff --git a/test/VariablesTest.php b/test/VariablesTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\View;
 
+use PHPUnit\Framework\TestCase;
 use Zend\View\Variables;
 use Zend\Config\Config;
 
 /**
  * @group      Zend_View
  */
-class VariablesTest extends \PHPUnit\Framework\TestCase
+class VariablesTest extends TestCase
 {
     public function setup()
     {

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,15 @@`
`9`	`9`
`10`	`10`	`namespace ZendTest\View\Helper;`
`11`	`11`
	`12`	`+use PHPUnit\Framework\TestCase;`
`12`	`13`	`use Zend\View\Renderer\PhpRenderer as View;`
`13`	`14`	`use Zend\View\Helper\DeclareVars;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* @group Zend_View`
`17`	`18`	`* @group Zend_View_Helper`
`18`	`19`	`*/`
`19`		`-class DeclareVarsTest extends \PHPUnit\Framework\TestCase`
	`20`	`+class DeclareVarsTest extends TestCase`
`20`	`21`	`{`
`21`	`22`	`public function setUp()`
`22`	`23`	`{`