Test updates

- use assertCount instead of assertEquals(..., count())
- single quotation instead of double
- `PHPUnit\Framework\TestCase` instead of `PHPUnit_Framework_TestCase`
- `expectException` instead of `setExpectedException`
- removed unused variables and imports
- added missing private properties

Author: michalbundyra

src/ZendViewRendererFactory.php

@@ -10,7 +10,6 @@
 use Interop\Container\ContainerInterface;
 use Zend\Expressive\Helper\ServerUrlHelper as BaseServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper as BaseUrlHelper;
-use Zend\Expressive\Router\RouterInterface;
 use Zend\View\HelperPluginManager;
 use Zend\View\Renderer\PhpRenderer;
 use Zend\View\Resolver;

test/HelperPluginManagerFactoryTest.php

@@ -7,8 +7,8 @@
 
 namespace ZendTest\Expressive\ZendView;
 
-use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ProphecyInterface;
 use Zend\Expressive\ZendView\HelperPluginManagerFactory;
 use Zend\ServiceManager\ServiceManager;
 use Zend\View\HelperPluginManager;
@@ -17,8 +17,8 @@
 class HelperPluginManagerFactoryTest extends TestCase
 {
     /**
-     * @var ContainerInterface
-    */
+     * @var ServiceManager|ProphecyInterface
+     */
     private $container;
 
     public function setUp()

test/ServerUrlHelperTest.php

@@ -7,13 +7,19 @@
 
 namespace ZendTest\Expressive\ZendView;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ProphecyInterface;
 use Psr\Http\Message\UriInterface;
 use Zend\Expressive\Helper\ServerUrlHelper as BaseHelper;
 use Zend\Expressive\ZendView\ServerUrlHelper;
 
 class ServerUrlHelperTest extends TestCase
 {
+    /**
+     * @var BaseHelper|ProphecyInterface
+     */
+    private $baseHelper;
+
     public function setUp()
     {
         $this->baseHelper = $this->prophesize(BaseHelper::class);

test/UrlHelperTest.php

@@ -7,12 +7,18 @@
 
 namespace ZendTest\Expressive\ZendView;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Prophecy\ProphecyInterface;
 use Zend\Expressive\Helper\UrlHelper as BaseHelper;
 use Zend\Expressive\ZendView\UrlHelper;
 
 class UrlHelperTest extends TestCase
 {
+    /**
+     * @var BaseHelper|ProphecyInterface
+     */
+    private $baseHelper;
+
     public function setUp()
     {
         $this->baseHelper = $this->prophesize(BaseHelper::class);

test/ZendViewRendererFactoryTest.php

@@ -8,11 +8,11 @@
 namespace ZendTest\Expressive\ZendView;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Prophecy\Prophecy\ProphecyInterface;
 use ReflectionProperty;
 use Zend\Expressive\Helper;
-use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\ZendView\ServerUrlHelper;
 use Zend\Expressive\ZendView\UrlHelper;
@@ -26,10 +26,15 @@
 class ZendViewRendererFactoryTest extends TestCase
 {
     /**
-     * @var ContainerInterface
+     * @var ContainerInterface|ProphecyInterface
     */
     private $container;
 
+    public function setUp()
+    {
+        $this->container = $this->prophesize(ContainerInterface::class);
+    }
+
     public function getConfigurationPaths()
     {
         return [
@@ -89,11 +94,6 @@ public function assertPathNamespaceContains($expected, $namespace, array $paths,
         $this->assertContains($expected, $found, $message);
     }
 
-    public function setUp()
-    {
-        $this->container = $this->prophesize(ContainerInterface::class);
-    }
-
     public function fetchPhpRenderer(ZendViewRenderer $view)
     {
         $r = new ReflectionProperty($view, 'renderer');
@@ -236,7 +236,6 @@ public function testConfiguresTemplateMap()
 
     public function testInjectsCustomHelpersIntoHelperManager()
     {
-        $router = $this->prophesize(RouterInterface::class)->reveal();
         $this->container->has('config')->willReturn(false);
         $this->container->has(HelperPluginManager::class)->willReturn(false);
         $this->injectBaseHelpers();
@@ -255,7 +254,6 @@ public function testInjectsCustomHelpersIntoHelperManager()
 
     public function testWillUseHelperManagerFromContainer()
     {
-        $router = $this->prophesize(RouterInterface::class)->reveal();
         $this->container->has('config')->willReturn(false);
         $this->injectBaseHelpers();
 

test/ZendViewRendererTest.php

@@ -8,7 +8,7 @@
 namespace ZendTest\Expressive\ZendView;
 
 use ArrayObject;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Expressive\Template\Exception\InvalidArgumentException;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\ZendView\ZendViewRenderer;
@@ -85,7 +85,8 @@ public function testInstantiatingWithoutEngineLazyLoadsOne()
 
     public function testInstantiatingWithInvalidLayout()
     {
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
+
         new ZendViewRenderer(null, []);
     }
 
@@ -95,7 +96,7 @@ public function testCanAddPathWithEmptyNamespace()
         $renderer->addPath(__DIR__ . '/TestAsset');
         $paths = $renderer->getPaths();
         $this->assertInternalType('array', $paths);
-        $this->assertEquals(1, count($paths));
+        $this->assertCount(1, $paths);
         $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertEmptyTemplatePathNamespace($paths[0]);
@@ -107,7 +108,7 @@ public function testCanAddPathWithNamespace()
         $renderer->addPath(__DIR__ . '/TestAsset', 'test');
         $paths = $renderer->getPaths();
         $this->assertInternalType('array', $paths);
-        $this->assertEquals(1, count($paths));
+        $this->assertCount(1, $paths);
         $this->assertTemplatePath(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathString(__DIR__ . '/TestAsset' . DIRECTORY_SEPARATOR, $paths[0]);
         $this->assertTemplatePathNamespace('test', $paths[0]);
@@ -146,7 +147,8 @@ public function invalidParameterValues()
     public function testRenderRaisesExceptionForInvalidParameterTypes($params)
     {
         $renderer = new ZendViewRenderer();
-        $this->setExpectedException(InvalidArgumentException::class);
+        $this->expectException(InvalidArgumentException::class);
+
         $renderer->render('foo', $params);
     }
 
@@ -202,7 +204,7 @@ public function testWillRenderContentInLayoutPassedToConstructor()
         $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
         $content = str_replace('<?php echo $name ?>', $name, $content);
         $this->assertContains($content, $result);
-        $this->assertContains('<title>Layout Page</title>', $result, sprintf("Received %s", $result));
+        $this->assertContains('<title>Layout Page</title>', $result, sprintf('Received %s', $result));
     }
 
     /**
@@ -255,7 +257,7 @@ public function testCanPassViewModelForLayoutToConstructor()
         $content = file_get_contents(__DIR__ . '/TestAsset/zendview.phtml');
         $content = str_replace('<?php echo $name ?>', $name, $content);
         $this->assertContains($content, $result);
-        $this->assertContains('<title>Layout Page</title>', $result, sprintf("Received %s", $result));
+        $this->assertContains('<title>Layout Page</title>', $result, sprintf('Received %s', $result));
     }
 
     /**