pathinfo support

Author: Fady Michel

src/Route.php

@@ -46,11 +46,11 @@ class Route
 
     /**
      * Route constructor.
+     * @param string $name
      * @param string $path
      * @param string $controller
      * @param string $action
      * @param array $requirements
-     * @param array $varsNames
      */
     public function __construct(string $name, string $path, string $controller, string $action, array $requirements = [])
     {
@@ -65,7 +65,7 @@ public function __construct(string $name, string $path, string $controller, stri
     /**
      * @return bool
      */
-    public function hasVars()
+    public function hasVars(): bool
     {
         if (empty($this->varsNames)) {
 
@@ -77,9 +77,9 @@ public function hasVars()
 
     /**
      * @param string $path
-     * @return null|bool
+     * @return array|null
      */
-    public function match(string $path)
+    public function match(string $path): ?array
     {
         $path = $this->trimPath($path);
         if (preg_match('#^'.$this->generateRegex().'$#sD', $path, $matches)) {
@@ -96,7 +96,7 @@ public function match(string $path)
     /**
      * @return string
      */
-    private function generateRegex()
+    private function generateRegex(): string
     {
 
         $regex = $this->path;
@@ -134,7 +134,7 @@ public function setName(string $name): Route
      * @param string $action
      * @return Route
      */
-    public function setAction(string $action)
+    public function setAction(string $action): self
     {
 
         $this->action = $action;
@@ -145,7 +145,7 @@ public function setAction(string $action)
      * @param string $controller
      * @return Route
      */
-    public function setController(string $controller)
+    public function setController(string $controller): self
     {
 
         $this->controller = $controller;
@@ -166,7 +166,7 @@ public function getPath(): string
      * @param string $path
      * @return Route
      */
-    public function setPath(string $path)
+    public function setPath(string $path): self
     {
         $this->path = $this->trimPath($path);
         return $this;
@@ -177,7 +177,7 @@ public function setPath(string $path)
      * @param array $varsNames
      * @return Route
      */
-    public function setVarsNames(array $varsNames)
+    public function setVarsNames(array $varsNames): self
     {
         $this->varsNames = $varsNames;
         return $this;
@@ -188,7 +188,7 @@ public function setVarsNames(array $varsNames)
      * @param string $varName
      * @return $this
      */
-    public function addVarName(string $varName)
+    public function addVarName(string $varName): self
     {
         $this->varsNames[] = $varName;
         return $this;
@@ -198,17 +198,17 @@ public function addVarName(string $varName)
      * @param array $vars
      * @return Route
      */
-    public function setVars(array $vars = [])
+    public function setVars(array $vars = []): self
     {
         $this->vars = $vars;
         return $this;
     }
 
     /**
-     * @param array $vars
+     * @param string $value
      * @return Route
      */
-    public function addVar(string $value)
+    public function addVar(string $value): self
     {
         $this->vars[] = $value;
         return $this;
@@ -217,31 +217,31 @@ public function addVar(string $value)
     /**
      * @return string
      */
-    public function getAction()
+    public function getAction(): string
     {
         return $this->action;
     }
 
     /**
      * @return string
      */
-    public function getController()
+    public function getController(): string
     {
         return $this->controller;
     }
 
     /**
      * @return array
      */
-    public function getVars()
+    public function getVars(): array
     {
         return $this->vars;
     }
 
     /**
      * @return array
      */
-    public function getVarsNames()
+    public function getVarsNames(): array
     {
         return $this->varsNames;
     }
@@ -271,7 +271,6 @@ public function setRequirements(array $requirements = []): Route
      */
     private function trimPath(string $path) :string
     {
-
         return '/'.rtrim(ltrim(trim($path), '/'), '/');
     }
 }

src/RouteBuilderInterface.php

@@ -13,6 +13,6 @@ interface RouteBuilderInterface
     /**
      * @return array Route
      */
-    public function routes() ;
+    public function routes(): array ;
 
 }

src/Router.php

@@ -2,6 +2,7 @@
 
 
 namespace Webby\Routing;
+
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
@@ -42,7 +43,7 @@ public function __construct(RouteBuilderInterface $routeBuilder = null)
      * @param Route $route
      * @return Router
      */
-    public function addRoute(Route $route) : RouterInterface
+    public function addRoute(Route $route): RouterInterface
     {
         if (!in_array($route, $this->routes)) {
             $this->routes[$route->getName()] = $route;
@@ -51,31 +52,37 @@ public function addRoute(Route $route) : RouterInterface
     }
 
     /**
-     * @param $url
+     * @param ServerRequestInterface $serverRequest
      * @return Route
      * @throws \Exception
      */
-    public function match(ServerRequestInterface $serverRequest) : Route
+    public function match(ServerRequestInterface $serverRequest): Route
     {
         /**
          * @var Route $route
          */
         foreach ($this->routes as $route) {
 
+            $serverParams = $serverRequest->getServerParams();
             $varsValues = $route->match($serverRequest->getUri()->getPath());
-            if (!is_null($varsValues)) {
-
-                if ($route->hasVars()) {
+            if (array_key_exists('PATH_INFO', $serverParams)) {
+                $varsValues = $route->match($serverParams['PATH_INFO']);
+            }
 
-                    $listVars = [];
-                    foreach ($varsValues as $key => $value) {
-                            $listVars[$key] = $value;
-                    }
+            if (is_null($varsValues)) {
+                continue;
+            }
 
-                    $route->setVars($listVars);
+            if ($route->hasVars()) {
+                $listVars = [];
+                foreach ($varsValues as $key => $value) {
+                    $listVars[$key] = $value;
                 }
-                return $route;
+
+                $route->setVars($listVars);
             }
+
+            return $route;
         }
 
         throw new \Exception('Aucune route ne correspond à l\'URL', self::NO_ROUTE);
@@ -91,7 +98,7 @@ public function match(ServerRequestInterface $serverRequest) : Route
      */
     public function generateUri(string $name, array $parameters = [], $referenceType = self::ABSOLUTE_PATH): string
     {
-        if (!array_key_exists($name , $this->routes)) {
+        if (!array_key_exists($name, $this->routes)) {
 
             throw new \Exception(sprintf('%s name route doesnt exist', $name));
         }
@@ -108,14 +115,14 @@ public function generateUri(string $name, array $parameters = [], $referenceType
                     sprintf(
                         '%s route need parameters: %s',
                         $name,
-                        implode(',',$route->getVarsNames())
+                        implode(',', $route->getVarsNames())
                     )
                 );
             }
 
             foreach ($route->getVarsNames() as $variable) {
-                $varName = trim($variable,'{\}');
-                if (!array_key_exists($varName , $parameters)) {
+                $varName = trim($variable, '{\}');
+                if (!array_key_exists($varName, $parameters)) {
                     throw new \Exception(sprintf('%s not found in parameters to generate url', $varName));
                 }
                 $uri = str_replace($variable, $parameters[$varName], $uri);