Bump phpunit and PSR standards (#72)

Author: barryvdh

.travis.yml

@@ -2,13 +2,6 @@ language: php
 
 matrix:
   include:
-    - php: 5.5.9
-      dist: trusty
-      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
-    - php: 5.5
-      dist: trusty
-    - php: 5.6
-      dist: xenial
     - php: 7.0
       dist: xenial
     - php: 7.1
@@ -24,5 +17,5 @@ install:
   - travis_retry composer update ${COMPOSER_FLAGS}
 
 script:
-  - vendor/bin/phpcs --standard=psr2 src/
+  - vendor/bin/phpcs --standard=psr12 src/
   - vendor/bin/phpunit

composer.json

@@ -12,22 +12,22 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
+        "php": "^7.0",
         "symfony/http-foundation": "~2.7|~3.0|~4.0|~5.0",
         "symfony/http-kernel": "~2.7|~3.0|~4.0|~5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0 || ^4.8.10",
+        "phpunit/phpunit": "^6|^7|^8|^9",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
-            "Asm89\\Stack\\": "src/Asm89/Stack/"
+            "Asm89\\Stack\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Asm89\\Stack\\": "test/Asm89/Stack/"
+            "Asm89\\Stack\\Tests\\": "tests/"
         }
     },
     "scripts": {

phpunit.xml.dist

@@ -8,11 +8,10 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
   <testsuites>
     <testsuite name="Stack Cors Test Suite">
-      <directory>./test/Asm89/</directory>
+      <directory>./tests</directory>
     </testsuite>
   </testsuites>
 

src/Asm89/Stack/Cors.php renamed to src/Cors.php

@@ -9,14 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace Asm89\Stack;
+namespace Asm89\Stack\Tests;
 
-use PHPUnit_Framework_TestCase;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Asm89\Stack\Cors;
+use Asm89\Stack\CorsService;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class CorsTest extends PHPUnit_Framework_TestCase
+class CorsTest extends TestCase
 {
     /**
      * @test
@@ -537,22 +538,3 @@ private function createStackedApp(array $options = array(), array $responseHeade
         return new Cors(new MockApp($responseHeaders), $passedOptions);
     }
 }
-
-class MockApp implements HttpKernelInterface
-{
-    private $responseHeaders;
-
-    public function __construct(array $responseHeaders)
-    {
-        $this->responseHeaders = $responseHeaders;
-    }
-
-    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
-    {
-        $response = new Response();
-
-        $response->headers->add($this->responseHeaders);
-
-        return $response;
-    }
-}

src/Asm89/Stack/CorsService.php renamed to src/CorsService.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Asm89\Stack\Tests;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class MockApp implements HttpKernelInterface
+{
+
+    private $responseHeaders;
+
+    public function __construct(array $responseHeaders)
+    {
+        $this->responseHeaders = $responseHeaders;
+    }
+
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+    {
+        $response = new Response();
+
+        $response->headers->add($this->responseHeaders);
+
+        return $response;
+    }
+}