Updated dependencies

- PHPUnit 5, 6 and 7 + config
- zendframework/zend-mvc to v2.7.15 || ^3.0.4

Author: michalbundyra

composer.json

@@ -22,11 +22,11 @@
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-json": "^2.6.1 || ^3.0",
-        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.15 || ^3.0.4",
         "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {

composer.lock

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
     <testsuites>
         <testsuite name="ZFApiProblem Module Tests">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
+
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./src</directory>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 </phpunit>

phpunit.xml.dist

@@ -6,7 +6,7 @@
 
 namespace ZFTest\ApiProblem;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use ZF\ApiProblem\ApiProblem;
 use ZF\ApiProblem\ApiProblemResponse;
 

test/ApiProblemResponseTest.php

@@ -6,7 +6,7 @@
 
 namespace ZFTest\ApiProblem;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use ReflectionObject;
 use ZF\ApiProblem\ApiProblem;
 use ZF\ApiProblem\Exception;

test/ApiProblemTest.php

@@ -6,7 +6,7 @@
 
 namespace ZFTest\ApiProblem\Listener;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Http\Request;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
@@ -16,7 +16,7 @@
 
 class ApiProblemListenerTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->event = new MvcEvent();
         $this->event->setError('this is an error event');

test/Listener/ApiProblemListenerTest.php

@@ -6,7 +6,7 @@
 
 namespace ZFTest\ApiProblem\Listener;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use TypeError;
 use Zend\Http\Request;
@@ -23,7 +23,7 @@ class RenderErrorListenerTest extends TestCase
      */
     protected $listener;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->listener = new RenderErrorListener();
     }

test/Listener/RenderErrorListenerTest.php

@@ -6,7 +6,7 @@
 
 namespace ZFTest\ApiProblem\Listener;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\Http\Response as HttpResponse;
 use Zend\Mvc\ResponseSender\SendResponseEvent;
 use ZF\ApiProblem\ApiProblem;
@@ -16,7 +16,7 @@
 
 class SendApiProblemResponseListenerTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->exception = new DomainException('Random error', 400);
         $this->apiProblem = new ApiProblem(400, $this->exception);

test/Listener/SendApiProblemResponseListenerTest.php

@@ -6,7 +6,7 @@
 
 namespace ZF\ApiProblem;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
@@ -34,12 +34,14 @@ public function testOnBootstrap()
     {
         $module = new Module();
 
-        $application = $this->getMock(Application::class, [], [], '', false);
+        $application = $this->getMockBuilder(Application::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $serviceLocator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
         $serviceLocator->method('get')->will($this->returnCallback([$this, 'serviceLocator']));
 
         $eventManager = $this->marshalEventManager();
-        $event = $this->getMock(MvcEvent::class);
+        $event = $this->getMockBuilder(MvcEvent::class)->getMock();
 
         $application->method('getServiceManager')->willReturn($serviceLocator);
         $application->method('getEventManager')->willReturn($eventManager);
@@ -55,7 +57,7 @@ public function serviceLocator($service)
                 return new ApiProblemListener();
                 break;
             case 'SendResponseListener':
-                $listener = $this->getMock(SendResponseListener::class);
+                $listener = $this->getMockBuilder(SendResponseListener::class)->getMock();
                 $listener->method('getEventManager')->willReturn(new EventManager());
 
                 return $listener;

test/ModuleTest.php

@@ -6,14 +6,14 @@
 
 namespace ZFTest\ApiProblem\View;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use ZF\ApiProblem\ApiProblem;
 use ZF\ApiProblem\View\ApiProblemModel;
 use ZF\ApiProblem\View\ApiProblemRenderer;
 
 class ApiProblemRendererTest extends TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->renderer = new ApiProblemRenderer();
     }