PHP 7.1+ support

.gitignore

@@ -3,3 +3,4 @@
 
 # ignore lock file since we have no extra dependencies
 composer.lock
+phpunit.xml

.travis.yml

@@ -2,13 +2,11 @@ sudo: false
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
-  - hhvm
+  - 7.3
+  - 7.4snapshot
+  - nightly
 
 script:
   - ./vendor/bin/phpunit
@@ -18,3 +16,8 @@ before_install:
 
 install:
   - composer install
+
+jobs:
+  allow_failures:
+    - php: 7.4snapshot
+    - php: nightly

composer.json

@@ -21,10 +21,10 @@
     }
   },
   "require": {
-    "php": ">=5.4.0"
+    "php": ">=7.1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8.35|~5.7"
+    "phpunit/phpunit": "^7.5"
   },
   "extra": {
     "branch-alias": {

phpunit.xml → phpunit.xml.dist

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         syntaxCheck="false"
-        >
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    colors="true"
+    verbose="true"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutOutputDuringTests="true"
+>
     <testsuites>
         <testsuite name="FastRoute Tests">
             <directory>./test/</directory>

src/DataGenerator.php

@@ -16,7 +16,7 @@ interface DataGenerator
      * @param array $routeData
      * @param mixed $handler
      */
-    public function addRoute($httpMethod, $routeData, $handler);
+    public function addRoute(string $httpMethod, array $routeData, $handler):void;
 
     /**
      * Returns dispatcher data in some unspecified format, which

src/DataGenerator/CharCountBased.php

@@ -4,12 +4,12 @@
 
 class CharCountBased extends RegexBasedAbstract
 {
-    protected function getApproxChunkSize()
+    protected function getApproxChunkSize():int
     {
         return 30;
     }
 
-    protected function processChunk($regexToRoutesMap)
+    protected function processChunk(array $regexToRoutesMap):array
     {
         $routeMap = [];
         $regexes = [];

src/DataGenerator/GroupCountBased.php

@@ -4,12 +4,12 @@
 
 class GroupCountBased extends RegexBasedAbstract
 {
-    protected function getApproxChunkSize()
+    protected function getApproxChunkSize():int
     {
         return 10;
     }
 
-    protected function processChunk($regexToRoutesMap)
+    protected function processChunk(array $regexToRoutesMap):array
     {
         $routeMap = [];
         $regexes = [];

src/DataGenerator/GroupPosBased.php

@@ -4,12 +4,12 @@
 
 class GroupPosBased extends RegexBasedAbstract
 {
-    protected function getApproxChunkSize()
+    protected function getApproxChunkSize():int
     {
         return 10;
     }
 
-    protected function processChunk($regexToRoutesMap)
+    protected function processChunk(array $regexToRoutesMap):array
     {
         $routeMap = [];
         $regexes = [];

src/DataGenerator/MarkBased.php

@@ -4,12 +4,12 @@
 
 class MarkBased extends RegexBasedAbstract
 {
-    protected function getApproxChunkSize()
+    protected function getApproxChunkSize():int
     {
         return 30;
     }
 
-    protected function processChunk($regexToRoutesMap)
+    protected function processChunk(array $regexToRoutesMap):array
     {
         $routeMap = [];
         $regexes = [];

src/DataGenerator/RegexBasedAbstract.php

@@ -17,14 +17,14 @@ abstract class RegexBasedAbstract implements DataGenerator
     /**
      * @return int
      */
-    abstract protected function getApproxChunkSize();
+    abstract protected function getApproxChunkSize():int;
 
     /**
      * @return mixed[]
      */
-    abstract protected function processChunk($regexToRoutesMap);
+    abstract protected function processChunk(array $regexToRoutesMap):array;
 
-    public function addRoute($httpMethod, $routeData, $handler)
+    public function addRoute(string $httpMethod, array $routeData, $handler):void
     {
         if ($this->isStaticRoute($routeData)) {
             $this->addStaticRoute($httpMethod, $routeData, $handler);
@@ -36,7 +36,7 @@ public function addRoute($httpMethod, $routeData, $handler)
     /**
      * @return mixed[]
      */
-    public function getData()
+    public function getData():array
     {
         if (empty($this->methodToRegexToRoutesMap)) {
             return [$this->staticRoutes, []];
@@ -48,7 +48,7 @@ public function getData()
     /**
      * @return mixed[]
      */
-    private function generateVariableRouteData()
+    private function generateVariableRouteData():array
     {
         $data = [];
         foreach ($this->methodToRegexToRoutesMap as $method => $regexToRoutesMap) {
@@ -63,7 +63,7 @@ private function generateVariableRouteData()
      * @param int
      * @return int
      */
-    private function computeChunkSize($count)
+    private function computeChunkSize(int $count):int
     {
         $numParts = max(1, round($count / $this->getApproxChunkSize()));
         return (int) ceil($count / $numParts);
@@ -73,12 +73,12 @@ private function computeChunkSize($count)
      * @param mixed[]
      * @return bool
      */
-    private function isStaticRoute($routeData)
+    private function isStaticRoute(array $routeData):bool
     {
         return count($routeData) === 1 && is_string($routeData[0]);
     }
 
-    private function addStaticRoute($httpMethod, $routeData, $handler)
+    private function addStaticRoute(string $httpMethod, array $routeData, $handler):void
     {
         $routeStr = $routeData[0];
 
@@ -103,9 +103,9 @@ private function addStaticRoute($httpMethod, $routeData, $handler)
         $this->staticRoutes[$httpMethod][$routeStr] = $handler;
     }
 
-    private function addVariableRoute($httpMethod, $routeData, $handler)
+    private function addVariableRoute(string $httpMethod, array $routeData, $handler):void
     {
-        list($regex, $variables) = $this->buildRegexForRoute($routeData);
+        [$regex, $variables] = $this->buildRegexForRoute($routeData);
 
         if (isset($this->methodToRegexToRoutesMap[$httpMethod][$regex])) {
             throw new BadRouteException(sprintf(
@@ -123,7 +123,7 @@ private function addVariableRoute($httpMethod, $routeData, $handler)
      * @param mixed[]
      * @return mixed[]
      */
-    private function buildRegexForRoute($routeData)
+    private function buildRegexForRoute(array $routeData):array
     {
         $regex = '';
         $variables = [];
@@ -133,7 +133,7 @@ private function buildRegexForRoute($routeData)
                 continue;
             }
 
-            list($varName, $regexPart) = $part;
+            [$varName, $regexPart] = $part;
 
             if (isset($variables[$varName])) {
                 throw new BadRouteException(sprintf(
@@ -159,7 +159,7 @@ private function buildRegexForRoute($routeData)
      * @param string
      * @return bool
      */
-    private function regexHasCapturingGroups($regex)
+    private function regexHasCapturingGroups(string $regex):bool
     {
         if (false === strpos($regex, '(')) {
             // Needs to have at least a ( to contain a capturing group

src/Dispatcher.php

@@ -22,5 +22,5 @@ interface Dispatcher
      *
      * @return array
      */
-    public function dispatch($httpMethod, $uri);
+    public function dispatch(string $httpMethod, string $uri):array;
 }

src/Dispatcher/CharCountBased.php

@@ -4,19 +4,14 @@
 
 class CharCountBased extends RegexBasedAbstract
 {
-    public function __construct($data)
-    {
-        list($this->staticRouteMap, $this->variableRouteData) = $data;
-    }
-
-    protected function dispatchVariableRoute($routeData, $uri)
+    protected function dispatchVariableRoute(array $routeData, string $uri):array
     {
         foreach ($routeData as $data) {
             if (!preg_match($data['regex'], $uri . $data['suffix'], $matches)) {
                 continue;
             }
 
-            list($handler, $varNames) = $data['routeMap'][end($matches)];
+            [$handler, $varNames] = $data['routeMap'][end($matches)];
 
             $vars = [];
             $i = 0;