update: add more unit tests. declare return type for all methods

Author: inhere

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 #matrix:
 #  include:

example/Controllers/Admin/UserController.php

@@ -14,12 +14,12 @@
  */
 class UserController
 {
-    public function indexAction()
+    public function indexAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }
 
-    public function infoAction()
+    public function infoAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }

example/Controllers/DemoController.php

@@ -14,18 +14,18 @@
  */
 class DemoController
 {
-    public function indexAction()
+    public function indexAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }
 
-    public function testAction()
+    public function testAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }
 
     // you can access by '/demo/oneTwo' or '/demo/one-two'
-    public function oneTwoAction()
+    public function oneTwoAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }

example/Controllers/HomeController.php

@@ -14,17 +14,17 @@
  */
 class HomeController
 {
-    public function indexAction()
+    public function indexAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }
 
-    public function testAction()
+    public function testAction(): void
     {
         echo 'hello, this is ' . __METHOD__ . '<br>';
     }
 
-    public function aboutAction()
+    public function aboutAction(): void
     {
         echo 'hello, this is about page';
     }

example/Controllers/RestController.php

@@ -14,33 +14,33 @@
  */
 class RestController
 {
-    public function indexAction()
+    public function indexAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
 
-    public function viewAction()
+    public function viewAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
 
-    public function createAction()
+    public function createAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
 
-    public function updateAction()
+    public function updateAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
 
-    public function patchAction()
+    public function patchAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
 
-    public function deleteAction()
+    public function deleteAction(): void
     {
         echo __METHOD__ . PHP_EOL;
     }
-}
+}

src/CachedRouter.php

@@ -60,7 +60,7 @@ public function __construct(array $config = [])
     /**
      * talk to me routes collect completed.
      */
-    public function completed()
+    public function completed(): void
     {
         $this->dumpRoutesCache();
     }
@@ -72,7 +72,7 @@ public function add(string $method, string $path, $handler, array $binds = [], a
     {
         // file cache exists check.
         if ($this->cacheLoaded) {
-            return Route::createFromArray([]);
+            return Route::createFromArray();
         }
 
         return parent::add($method, $path, $handler, $binds, $opts);
@@ -200,7 +200,7 @@ public function isCacheEnable(): bool
     /**
      * @param bool $cacheEnable
      */
-    public function setCacheEnable($cacheEnable)
+    public function setCacheEnable($cacheEnable): void
     {
         $this->cacheEnable = (bool)$cacheEnable;
     }
@@ -216,7 +216,7 @@ public function getCacheFile(): string
     /**
      * @param string $cacheFile
      */
-    public function setCacheFile(string $cacheFile)
+    public function setCacheFile(string $cacheFile): void
     {
         $this->cacheFile = \trim($cacheFile);
     }

src/Dispatcher/Dispatcher.php

@@ -86,7 +86,7 @@ public function dispatch(int $status, string $path, string $method, $route)
      *     'schemes' => ['https'],
      * ]
      */
-    protected function validateMetadata(array $options)
+    protected function validateMetadata(array $options): void
     {
         // 1. validate Schema
 

src/Dispatcher/DispatcherInterface.php

@@ -17,15 +17,15 @@
  */
 interface DispatcherInterface
 {
-    const FAV_ICON = '/favicon.ico';
+    public const FAV_ICON = '/favicon.ico';
 
     // some route events
-    const ON_FOUND = 'found';
-    const ON_NOT_FOUND = 'notFound';
-    const ON_METHOD_NOT_ALLOWED = 'methodNotAllowed';
-    const ON_EXEC_START = 'execStart';
-    const ON_EXEC_END = 'execEnd';
-    const ON_EXEC_ERROR = 'execError';
+    public const ON_FOUND              = 'found';
+    public const ON_NOT_FOUND          = 'notFound';
+    public const ON_METHOD_NOT_ALLOWED = 'methodNotAllowed';
+    public const ON_EXEC_START         = 'execStart';
+    public const ON_EXEC_END           = 'execEnd';
+    public const ON_EXEC_ERROR         = 'execError';
 
     /**
      * Runs the callback for the given path and method.

src/Dispatcher/Psr15Dispatcher.php

@@ -34,7 +34,7 @@ public function handleRequest(ServerRequestInterface $request): ResponseInterfac
         $method = $request->getMethod();
 
         /** @var Route $route */
-        list($status, $path, $route) = $this->getRouter()->match($path, $method);
+        [$status, $path, $route] = $this->getRouter()->match($path, $method);
 
         $chains = $this->getRouter()->getChains();
 

src/Dispatcher/SimpleDispatcher.php

@@ -91,7 +91,7 @@ public function __construct(array $options = [], RouterInterface $router = null)
      * @param array $options
      * @throws \LogicException
      */
-    public function initOptions(array $options)
+    public function initOptions(array $options): void
     {
         if ($this->initialized) {
             throw new \LogicException('Has already started to distributed routing, and configuration is not allowed!');
@@ -133,7 +133,7 @@ public function dispatchUri(string $path = null, string $method = null)
         $method = \strtoupper($method);
 
         /** @var Route $route */
-        list($status, $path, $route) = $this->router->match($path, $method);
+        [$status, $path, $route] = $this->router->match($path, $method);
 
         return $this->dispatch($status, $path, $method, $route);
     }
@@ -381,7 +381,7 @@ protected function fire(string $event, array $args = [])
      * @param string $name
      * @param $value
      */
-    public function setOption(string $name, $value)
+    public function setOption(string $name, $value): void
     {
         $this->options[$name] = $value;
     }
@@ -455,7 +455,7 @@ public function getOptions(): array
     /**
      * @param array $options
      */
-    public function setOptions(array $options)
+    public function setOptions(array $options): void
     {
         $this->options = \array_merge($this->options, $options);
     }