Merge pull request #177 from koriym/gh-action

Enable PHP 7.2-8.1 compat

.github/workflows/continuous-integration.yml

@@ -0,0 +1,50 @@
+name: Continuous Integration
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        operating-system:
+          - ubuntu-latest
+        php-version:
+          - '7.2'
+          - '7.3'
+          - '7.4'
+          - '8.0'
+          - '8.1'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Setup PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          coverage: none
+          tools: none
+          ini-values: assert.exception=1, zend.assertions=1
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-interaction --prefer-dist --ignore-platform-req=php
+
+      - name: Run test suite
+        run: ./vendor/bin/phpunit

.scrutinizer.yml

@@ -1,10 +1,8 @@
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
 filter:
     paths: ["src/*"]
-tools:
-    external_code_coverage: true
-    php_code_coverage: true
-    php_sim: true
-    php_mess_detector: true
-    php_pdepend: true
-    php_analyzer: true
-    php_cpd: true

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017, Aura for PHP
+Copyright (c) 2015-2022, Aura for PHP
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -12,8 +12,7 @@ Alternatively, [download a release][], or clone this repository, then map the
 
 ## Dependencies
 
-This package requires PHP 5.5 or later; it has been tested on PHP 5.6, PHP 7,
-PHP 7.1 and HHVM. We recommend using the latest available version of PHP as a
+This package requires PHP 7.2 or later. It has been tested on PHP 7.2-8.1. We recommend using the latest available version of PHP as a
 matter of principle.
 
 Aura library packages may sometimes depend on external interfaces, but never on

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
+        "php": "^7.2 || ^8.0",
         "psr/http-message": "~1.0",
         "psr/log": "~1.0"
     },
@@ -28,7 +28,7 @@
     },
     "require-dev": {
         "zendframework/zend-diactoros": "~1.0",
-        "phpunit/phpunit": "~5.7 || ~4.8"
+        "phpunit/phpunit": "^8.0"
     },
     "autoload-dev": {
         "psr-4": {

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <phpunit bootstrap="./phpunit.php">
     <testsuites>
-        <testsuite>
+        <testsuite name="Aura.Router test suite">
             <directory>./tests</directory>
         </testsuite>
     </testsuites>

tests/GeneratorTest.php

@@ -1,7 +1,9 @@
 <?php
 namespace Aura\Router;
 
-class GeneratorTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class GeneratorTest extends TestCase
 {
     /**
      * @var Map
@@ -13,7 +15,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
      */
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $container = new RouterContainer();
@@ -63,7 +65,7 @@ public function testGenerate()
 
     public function testGenerateMissing()
     {
-        $this->setExpectedException('Aura\Router\Exception\RouteNotFound');
+        $this->expectException('Aura\Router\Exception\RouteNotFound');
         $this->generator->generate('no-such-route');
     }
 

tests/Helper/RouteRawTest.php

@@ -3,14 +3,15 @@
 
 use Aura\Router\Exception\RouteNotFound;
 use Aura\Router\RouterContainer;
+use PHPUnit\Framework\TestCase;
 
-class RouteRawTest extends \PHPUnit_Framework_TestCase
+class RouteRawTest extends TestCase
 {
     protected $container;
     protected $map;
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $container = new RouterContainer();

tests/Helper/RouteTest.php

@@ -3,14 +3,15 @@
 
 use Aura\Router\Exception\RouteNotFound;
 use Aura\Router\RouterContainer;
+use PHPUnit\Framework\TestCase;
 
-class RouteTest extends \PHPUnit_Framework_TestCase
+class RouteTest extends TestCase
 {
     protected $container;
     protected $map;
     protected $generator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $container = new RouterContainer();

tests/MapTest.php

@@ -1,11 +1,13 @@
 <?php
 namespace Aura\Router;
 
-class MapTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class MapTest extends TestCase
 {
     protected $map;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $container = new RouterContainer();
@@ -28,7 +30,7 @@ protected function assertRoute($expect, $actual)
     public function testRouteAlreadyExists()
     {
         $this->map->route('foo', '/foo');
-        $this->setExpectedException('Aura\Router\Exception\RouteAlreadyExists');
+        $this->expectException('Aura\Router\Exception\RouteAlreadyExists');
         $this->map->route('foo', '/foo');
     }
 

tests/MatcherTest.php

@@ -1,16 +1,17 @@
 <?php
 namespace Aura\Router;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequestFactory;
 
-class MatcherTest extends \PHPUnit_Framework_TestCase
+class MatcherTest extends TestCase
 {
     protected $map;
     protected $matcher;
     protected $logger;
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $container = new RouterContainer();

tests/RouteTest.php

@@ -1,9 +1,10 @@
 <?php
 namespace Aura\Router;
 
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequestFactory;
 
-class RouteTest extends \PHPUnit_Framework_TestCase
+class RouteTest extends TestCase
 {
     public function test__get()
     {
@@ -16,7 +17,7 @@ public function testImmutablePath()
     {
         $route = new Route();
         $route->path('/foo');
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\ImmutableProperty',
             'Aura\Router\Route::$path'
         );
@@ -27,7 +28,7 @@ public function testImmutablePathPrefix()
     {
         $route = new Route();
         $route->path('/foo');
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\ImmutableProperty',
             'Aura\Router\Route::$pathPrefix'
         );
@@ -38,7 +39,7 @@ public function testImmutableName()
     {
         $route = new Route();
         $route->name('/foo');
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\ImmutableProperty',
             'Aura\Router\Route::$name'
         );
@@ -49,7 +50,7 @@ public function testImmutableNamePrefix()
     {
         $route = new Route();
         $route->name('/foo');
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\ImmutableProperty',
             'Aura\Router\Route::$namePrefix'
         );

tests/Rule/AbstractRuleTest.php

@@ -2,9 +2,10 @@
 namespace Aura\Router\Rule;
 
 use Aura\Router\Route;
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequestFactory;
 
-abstract class AbstractRuleTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractRuleTest extends TestCase
 {
     protected $rule;
 

tests/Rule/AcceptsTest.php

@@ -1,9 +1,9 @@
 <?php
 namespace Aura\Router\Rule;
 
-class AcceptTest extends AbstractRuleTest
+class AcceptsTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setup(): void
     {
         parent::setup();
         $this->rule = new Accepts();

tests/Rule/AllowsTest.php

@@ -3,7 +3,7 @@
 
 class AllowsTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setup(): void
     {
         parent::setup();
         $this->rule = new Allows();

tests/Rule/CustomTest.php

@@ -3,7 +3,7 @@
 
 class CustomTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setup(): void
     {
         parent::setup();
         $this->rule = new FakeCustom();

tests/Rule/HostTest.php

@@ -3,7 +3,7 @@
 
 class HostTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setup(): void
     {
         parent::setup();
         $this->rule = new Host();

tests/Rule/PathTest.php

@@ -3,7 +3,7 @@
 
 class PathTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setUp(): void
     {
         parent::setup();
         $this->rule = new Path();

tests/Rule/RuleIteratorTest.php

@@ -1,11 +1,13 @@
 <?php
 namespace Aura\Router\Rule;
 
-class RuleIteratorTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class RuleIteratorTest extends TestCase
 {
     protected $ruleIterator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->ruleIterator = new RuleIterator();
@@ -46,7 +48,7 @@ public function testUnexpectedValue()
             function () { return 'string'; }
         ]);
 
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\UnexpectedValue',
             'string'
         );
@@ -60,7 +62,7 @@ public function testUnexpectedValueObject()
             function () { return (object) []; }
         ]);
 
-        $this->setExpectedException(
+        $this->expectException(
             'Aura\Router\Exception\UnexpectedValue',
             'object of type stdClass'
         );

tests/Rule/SecureTest.php

@@ -3,7 +3,7 @@
 
 class SecureTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setUp(): void
     {
         parent::setup();
         $this->rule = new Secure();

tests/Rule/SpecialTest.php

@@ -3,7 +3,7 @@
 
 class SpecialTest extends AbstractRuleTest
 {
-    public function setup()
+    public function setUp(): void
     {
         parent::setup();
         $this->rule = new Special();