ZendTest string class names changed to ::class

Author: kokspflanze

test/Helper/Placeholder/RegistryTest.php

@@ -12,6 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Zend\View\Helper\Placeholder\Registry;
 use Zend\View\Helper\Placeholder\Container;
+use ZendTest\View\Helper\TestAsset;
 
 /**
  * Test class for Zend\View\Helper\Placeholder\Registry.
@@ -103,17 +104,17 @@ public function testSetContainerCreatesRegistersContainerInstance()
     public function testContainerClassAccessorsSetState()
     {
         $this->assertEquals(Container::class, $this->registry->getContainerClass());
-        $this->registry->setContainerClass('ZendTest\View\Helper\TestAsset\MockContainer');
+        $this->registry->setContainerClass(TestAsset\MockContainer::class);
         $this->assertEquals(
-            'ZendTest\View\Helper\TestAsset\MockContainer',
+            TestAsset\MockContainer::class,
             $this->registry->getContainerClass()
         );
     }
 
     public function testSetContainerClassThrowsExceptionWithInvalidContainerClass()
     {
         try {
-            $this->registry->setContainerClass('ZendTest\View\Helper\TestAsset\BogusContainer');
+            $this->registry->setContainerClass(TestAsset\BogusContainer::class);
             $this->fail('Invalid container classes should not be accepted');
         } catch (\Exception $e) {
         }
@@ -136,17 +137,17 @@ public function testDeleteContainerReturnsFalseIfContainerDoesNotExist()
 
     public function testUsingCustomContainerClassCreatesContainersOfCustomClass()
     {
-        $this->registry->setContainerClass('ZendTest\View\Helper\TestAsset\MockContainer');
+        $this->registry->setContainerClass(TestAsset\MockContainer::class);
         $container = $this->registry->createContainer('foo');
-        $this->assertInstanceOf('ZendTest\View\Helper\TestAsset\MockContainer', $container);
+        $this->assertInstanceOf(TestAsset\MockContainer::class, $container);
     }
 
     /**
      * @group ZF-10793
      */
     public function testSetValueCreateContainer()
     {
-        $this->registry->setContainerClass('ZendTest\View\Helper\TestAsset\MockContainer');
+        $this->registry->setContainerClass(TestAsset\MockContainer::class);
         $data = [
             'ZF-10793'
         ];

test/PhpRendererTest.php

@@ -20,6 +20,8 @@
 use Zend\View\Resolver\TemplatePathStack;
 use Zend\View\Variables;
 use Zend\Filter\FilterChain;
+use ZendTest\View\TestAsset\SharedInstance;
+use ZendTest\View\TestAsset\Uninvokable;
 
 /**
  * @group      Zend_View
@@ -219,11 +221,11 @@ public function testPropertyOverloadingShouldProxyToVariablesContainer()
     public function testMethodOverloadingShouldReturnHelperInstanceIfNotInvokable()
     {
         $helpers = new HelperPluginManager(new ServiceManager(), ['invokables' => [
-            'uninvokable' => 'ZendTest\View\TestAsset\Uninvokable',
+            'uninvokable' => Uninvokable::class,
         ]]);
         $this->renderer->setHelperPluginManager($helpers);
         $helper = $this->renderer->uninvokable();
-        $this->assertInstanceOf('ZendTest\View\TestAsset\Uninvokable', $helper);
+        $this->assertInstanceOf(Uninvokable::class, $helper);
     }
 
     /**
@@ -232,7 +234,7 @@ public function testMethodOverloadingShouldReturnHelperInstanceIfNotInvokable()
     public function testMethodOverloadingShouldInvokeHelperIfInvokable()
     {
         $helpers = new HelperPluginManager(new ServiceManager(), ['invokables' => [
-            'invokable' => 'ZendTest\View\TestAsset\Invokable',
+            'invokable' => Uninvokable::class,
         ]]);
         $this->renderer->setHelperPluginManager($helpers);
         $return = $this->renderer->invokable('it works!');
@@ -443,7 +445,7 @@ public function testSharedInstanceHelper()
     {
         $helpers = new HelperPluginManager(new ServiceManager(), [
             'invokables' => [
-                'sharedinstance' => 'ZendTest\View\TestAsset\SharedInstance',
+                'sharedinstance' => SharedInstance::class,
             ],
             'shared' => [
                 'sharedinstance' => false,
@@ -458,7 +460,7 @@ public function testSharedInstanceHelper()
 
         $helpers = new HelperPluginManager(new ServiceManager(), [
             'invokables' => [
-                'sharedinstance' => 'ZendTest\View\TestAsset\SharedInstance',
+                'sharedinstance' => SharedInstance::class,
             ],
             'shared' => [
                 'sharedinstance' => true,