Update to Jasny PHP code quality 2.1

Use Jasny\TestHelper (rather than defining a similar in this lib)

13 files changed, 39 insertions, 73 deletions

diff --git a/composer.json b/composer.json
index ad3d7c8..1774b74 100644
--- a/composer.json
+++ b/composer.json
@@ -21,11 +21,14 @@
         "psr/log": "^1.0"
     },
     "require-dev": {
-        "jasny/php-code-quality": "^2.0"
+        "jasny/php-code-quality": "^2.1.3"
     },
     "autoload": {
         "psr-4": {
             "Jasny\\": "src/"
         }
+    },
+    "autoload-dev": {
+        "classmap": ["tests/support/"]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e8a1ac3..1861d7c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit
     colors="true"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
diff --git a/tests/Router/ControllerFactoryTest.php b/tests/Router/ControllerFactoryTest.php
index 47efefd..855edb2 100644
--- a/tests/Router/ControllerFactoryTest.php
+++ b/tests/Router/ControllerFactoryTest.php
@@ -3,14 +3,14 @@
 namespace Jasny\Router;
 
 use Jasny\Router\ControllerFactory;
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
 
 /**
  * @covers Jasny\Router\ControllerFactory
  */
 class ControllerFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
     
     public function testInvoke()
     {
diff --git a/tests/Router/Middleware/BasePathTest.php b/tests/Router/Middleware/BasePathTest.php
index 36dfaa2..b1c972c 100644
--- a/tests/Router/Middleware/BasePathTest.php
+++ b/tests/Router/Middleware/BasePathTest.php
@@ -5,17 +5,17 @@ namespace Jasny\Router\Middleware;
 use Jasny\Router\Middleware\BasePath;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
-
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
+use Jasny\Router\MockResponse;
 
 /**
  * @covers Jasny\Router\Middleware\BasePath
  */
 class BasePathTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
+    use MockResponse;
     
     /**
      * Provide data for testing invalid BasePath creation
@@ -30,7 +30,7 @@ class BasePathTest extends \PHPUnit_Framework_TestCase
             [null],
             [false],
             [['test']],
-            [(object)['test']],
+            [(object)['foo' => 'test']],
             [12345]
         ];
     }
diff --git a/tests/Router/Middleware/DetermineRouteTest.php b/tests/Router/Middleware/DetermineRouteTest.php
index fb9bfb1..171e783 100644
--- a/tests/Router/Middleware/DetermineRouteTest.php
+++ b/tests/Router/Middleware/DetermineRouteTest.php
@@ -6,14 +6,14 @@ use Jasny\Router\Middleware\DetermineRoute;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
 
 /**
  * @covers Jasny\Router\Middleware\DetermineRoute
  */
 class DetermineRouteTest extends PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
     
     public function testConstruct()
     {
diff --git a/tests/Router/Middleware/ErrorPageTest.php b/tests/Router/Middleware/ErrorPageTest.php
index 3e63528..e110c98 100644
--- a/tests/Router/Middleware/ErrorPageTest.php
+++ b/tests/Router/Middleware/ErrorPageTest.php
@@ -8,11 +8,11 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
 
 class ErrorPageTest extends PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
     
     public function testGetRouter()
     {
diff --git a/tests/Router/Runner/CallbackTest.php b/tests/Router/Runner/CallbackTest.php
index 475ccc1..4efc73b 100644
--- a/tests/Router/Runner/CallbackTest.php
+++ b/tests/Router/Runner/CallbackTest.php
@@ -6,8 +6,8 @@ use Jasny\Router\Route;
 use Jasny\Router\Runner;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-    
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
+use Jasny\Router\MockResponse;
 
 /**
  * @covers Jasny\Router\Runner\Callback
@@ -16,7 +16,8 @@ use Jasny\Router\TestHelpers;
  */
 class CallbackTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
+    use MockResponse;
     
     public function testInvoke()
     {
diff --git a/tests/Router/Runner/ControllerTest.php b/tests/Router/Runner/ControllerTest.php
index 26d0578..84acef4 100644
--- a/tests/Router/Runner/ControllerTest.php
+++ b/tests/Router/Runner/ControllerTest.php
@@ -7,8 +7,8 @@ use Jasny\Router\Runner;
 use Jasny\Router\ControllerFactory;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
+use Jasny\Router\MockResponse;
 
 /**
  * @covers Jasny\Router\Runner\Controller
@@ -17,7 +17,8 @@ use Jasny\Router\TestHelpers;
  */
 class ControllerTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
+    use MockResponse;
     
     public function testInvoke()
     {
diff --git a/tests/Router/Runner/DelegateTest.php b/tests/Router/Runner/DelegateTest.php
index e8800d1..0d2b19d 100644
--- a/tests/Router/Runner/DelegateTest.php
+++ b/tests/Router/Runner/DelegateTest.php
@@ -6,8 +6,8 @@ use Jasny\Router\Route;
 use Jasny\Router\Runner;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
+use Jasny\Router\MockResponse;
 
 /**
  * @covers Jasny\Router\Runner\Delegate
@@ -15,7 +15,8 @@ use Jasny\Router\TestHelpers;
  */
 class DelegateTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
+    use MockResponse;
     
     public function testInvoke()
     {
diff --git a/tests/Router/Runner/PhpScriptTest.php b/tests/Router/Runner/PhpScriptTest.php
index 1648a69..988891e 100644
--- a/tests/Router/Runner/PhpScriptTest.php
+++ b/tests/Router/Runner/PhpScriptTest.php
@@ -6,11 +6,10 @@ use Jasny\Router\Route;
 use Jasny\Router\Runner;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
-
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
-
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
+use Jasny\Router\MockResponse;
 
 /**
  * @covers Jasny\Router\Runner\PhpScript
@@ -19,8 +18,9 @@ use Jasny\Router\TestHelpers;
  */
 class PhpScriptTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
-    
+    use TestHelper;
+    use MockResponse;
+
     /**
      * @var vfsStreamDirectory
      */
diff --git a/tests/Router/RunnerTest.php b/tests/Router/RunnerTest.php
index 3e558b4..13a2a32 100644
--- a/tests/Router/RunnerTest.php
+++ b/tests/Router/RunnerTest.php
@@ -4,14 +4,14 @@ use Jasny\Router\Runner;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
 
 /**
  * @covers Jasny\Router\Runner
  */
 class RunnerTest extends PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
     
     /**
      * Test runner __invoke method
diff --git a/tests/RouterTest.php b/tests/RouterTest.php
index f76f046..af92009 100644
--- a/tests/RouterTest.php
+++ b/tests/RouterTest.php
@@ -12,14 +12,14 @@ use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UriInterface;
 use PHPUnit_Framework_MockObject_Matcher_InvokedCount as InvokedCount;
 
-use Jasny\Router\TestHelpers;
+use Jasny\TestHelper;
 
 /**
  * @covers Jasny\Router
  */
 class RouterTest extends \PHPUnit_Framework_TestCase
 {
-    use TestHelpers;
+    use TestHelper;
     
     /**
      * Test creating Router
diff --git a/tests/support/MockResponse.php b/tests/support/MockResponse.php
index 5fe9845..aefc683 100644
--- a/tests/support/MockResponse.php
+++ b/tests/support/MockResponse.php
@@ -2,56 +2,16 @@
 
 namespace Jasny\Router;
 
-use PHPUnit_Framework_MockObject_Matcher_Invocation as Invocation;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 
 /**
- * Helper methods for PHPUnit tests
+ * Helper methods for PHPUnit tests to mock a specific response
  */
-trait TestHelpers
+trait MockResponse
 {
     /**
-     * Create mock for next callback
-     * 
-     * @param Invocation  $matcher
-     * @param array       $with     With arguments
-     * @param mixed       $return
-     * @return MockObject
-     */
-    protected function createCallbackMock(Invocation $matcher, $with = [], $return = null)
-    {
-        $callback = $this->getMockBuilder(\stdClass::class)->setMethods(['__invoke'])->getMock();
-        $callback->expects($matcher)->method('__invoke')
-            ->with(...$with)
-            ->willReturn($return);
-        
-        return $callback;
-    }
-    
-    /**
-     * Assert a non-fatal error
-     * 
-     * @param int    $type
-     * @param string $message
-     */
-    protected function assertLastError($type, $message)
-    {
-        $error = error_get_last();
-        
-        $expect = compact('type', 'message');
-        
-        if (is_array($error)) {
-            $error = array_intersect_key($error, $expect);
-        }
-        
-        $this->assertEquals($expect, $error);
-    }
-    
-    /**
      * Mock the calls for a 404 Not Found response
      * 
      * @return array [request, response, expect]