selamiphp / router

src/Router.php

Doc Comments +1 added lines

@@ -160,6 +160,7 @@
      * @param  string                      $action
      * @param  int                         $returnType
      * @param  string                      $alias
+     * @param string $requestMethods
      * @throws InvalidArgumentException
      * @throws UnexpectedValueException
      */

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 
 namespace Selami;
 
-use FastRoute;
 use InvalidArgumentException;
 use UnexpectedValueException;
 use RuntimeException;

Spacing +6 added lines, -6 removed lines

@@ -118,7 +118,7 @@ 
         string $method,
         string $requestedPath,
         string $folder = '',
-        ?string $cachedFile = null
+        ? string $cachedFile = null
     ) {
         if (!in_array($method, self::$validRequestMethods, true)) {
             $message = sprintf('%s is not valid Http request method.', $method);
@@ -126,7 +126,7 @@ 
         }
         $this->method = $method;
         $this->requestedPath = $this->extractFolder($requestedPath, $folder);
-        $this->defaultReturnType = ($defaultReturnType >=1 && $defaultReturnType <=7) ? $defaultReturnType : self::HTML;
+        $this->defaultReturnType = ($defaultReturnType >= 1 && $defaultReturnType <= 7) ? $defaultReturnType : self::HTML;
         $this->cachedFile = $cachedFile;
     }
 
@@ -163,8 +163,8 @@ 
         $requestMethods,
         string $route,
         $action,
-        ?int $returnType = null,
-        ?string $alias = null
+        ? int $returnType = null,
+        ? string $alias = null
     ) : void {
     
         $requestMethodsGiven = is_array($requestMethods) ? (array) $requestMethods : [0 => $requestMethods];
@@ -202,12 +202,12 @@ 
      * @param int|null $returnType
      * @return int
      */
-    private function determineReturnType(?int $returnType) : int
+    private function determineReturnType(? int $returnType) : int
     {
         if ($returnType === null) {
             return $this->defaultReturnType;
         }
-        return ($returnType >=1 && $returnType <=7) ? $returnType : self::HTML;
+        return ($returnType >= 1 && $returnType <= 7) ? $returnType : self::HTML;
     }
 
     /**

src/Dispatcher.php

Doc Comments +6 added lines

@@ -38,6 +38,9 @@ 
     private $routerClosures = [];
 
 
+    /**
+     * @param null|string $cachedFile
+     */
     public function __construct(array $routes, int $defaultReturnType, ?string  $cachedFile)
     {
         $this->routes = $routes;
@@ -69,6 +72,9 @@ 
         return new FastRoute\Dispatcher\GroupCountBased($routeCollector->getData());
     }
 
+    /**
+     * @param FastRoute\RouteCollector $routeCollector
+     */
     private function createCachedRoute($routeCollector) : void
     {
         if ($this->cachedFile !== null && !file_exists($this->cachedFile)) {

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Selami;
 
@@ -38,7 +38,7 @@ 
     private $routerClosures = [];
 
 
-    public function __construct(array $routes, int $defaultReturnType, ?string  $cachedFile)
+    public function __construct(array $routes, int $defaultReturnType, ? string  $cachedFile)
     {
         $this->routes = $routes;
         $this->defaultReturnType = $defaultReturnType;
@@ -100,10 +100,10 @@ 
      */
     private function addRoutes(FastRoute\RouteCollector $route) : void
     {
-        $routeIndex=0;
+        $routeIndex = 0;
         foreach ($this->routes as $definedRoute) {
             $definedRoute[3] = $definedRoute[3] ?? $this->defaultReturnType;
-            $routeName = 'routeClosure'.$routeIndex;
+            $routeName = 'routeClosure' . $routeIndex;
             $route->addRoute(strtoupper($definedRoute[0]), $definedRoute[1], $routeName);
             $routeIndex++;
         }
@@ -111,13 +111,13 @@ 
 
     private function setRouteClosures() : void
     {
-        $routeIndex=0;
+        $routeIndex = 0;
         foreach ($this->routes as $definedRoute) {
             $definedRoute[3] = $definedRoute[3] ?? $this->defaultReturnType;
-            $routeName = 'routeClosure'.$routeIndex;
+            $routeName = 'routeClosure' . $routeIndex;
             [$requestMedhod, $url, $controller, $returnType] = $definedRoute;
-            $returnType = ($returnType >=1 && $returnType <=7) ? $returnType : $this->defaultReturnType;
-            $this->routerClosures[$routeName]= function ($args) use ($controller, $returnType) {
+            $returnType = ($returnType >= 1 && $returnType <= 7) ? $returnType : $this->defaultReturnType;
+            $this->routerClosures[$routeName] = function($args) use ($controller, $returnType) {
                 return  ['controller' => $controller, 'returnType'=> $returnType, 'args'=> $args];
             };
             $routeIndex++;