Merge pull request #9 from marussoft/fix-placeholders-types

Fix placeholders types

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-- "7.0"
-- "7.1"
 - "7.2"
 - "7.3"
 

README.md

@@ -1,2 +1,3 @@
 # Router
 
+![](https://travis-ci.org/marussoft/router.svg?branch=master)

phpunit

@@ -1 +1 @@
-./vendor/bin/phpunit $*
+php ./vendor/bin/phpunit $*

src/AbstractRouteHandler.php

@@ -7,7 +7,6 @@
 use Marussia\Router\Exceptions\PlaceholdersForPatternNotFoundException;
 use Marussia\Router\Exceptions\HandlerIsNotSetException;
 use Marussia\Router\Exceptions\ActionIsNotSetException;
-use Marussia\Router\Contracts\RequestInterface;
 
 abstract class AbstractRouteHandler
 {
@@ -17,6 +16,23 @@ abstract class AbstractRouteHandler
 
     protected $fillable = [];
 
+    protected $attributeTypes = [
+        'STRING' => '([a-z0-9\-]+)',
+        'INTEGER' => '([0-9]+)',
+        'ARRAY' => '([a-z0-9]+)/(([a-z0-9\-]+/)+|([a-z0-9\-_]+)+)($)',
+    ];
+
+    const PLACEHOLDER_TYPE_STRING = 'STRING';
+
+    const PLACEHOLDER_TYPE_INTEGER = 'INTEGER';
+
+    const PLACEHOLDER_TYPE_ARRAY = 'ARRAY';
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
     public function route(string $method, string $pattern) : self
     {
         if (!is_null($this->matched)) {
@@ -84,14 +100,14 @@ public function isMatched() : bool
         return true;
     }
 
-    public function setRequest(RequestInterface $request)
+    public function getPlaceholderRegExp(string $type) : string
     {
-        $this->request = $request;
+        return $this->attributeTypes[strtoupper($type)];
     }
-    
-    public function __call(string $name , array $arguments = []) : self
+
+    public function hasPlaceholderType(string $type) : bool
     {
-        return $this;
+        return array_key_exists(strtoupper($type), $this->attributeTypes);
     }
 
     protected function checkErrors() : void

src/Exceptions/RouteFileAliasIsNotStringException.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Marussia\Router\Exceptions;
+
+class RouteFileAliasIsNotStringException extends \Exception
+{
+    public function __construct(string $aliasFor, string $type)
+    {
+        parent::__construct('Routes file alias for ' . $aliasFor . ' will be type string. Type ' . $type . ' given.');
+    }
+}

src/Exceptions/RouterIsNotInitializedException.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Marussia\Router\Exceptions;
+
+class RouterIsNotInitializedException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('Router is not initialized');
+    }
+}

src/Exceptions/RoutesDirPathIsNotSetException.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Marussia\Router\Exceptions;
+
+class RoutesDirPathIsNotSetException extends \Exception
+{
+    public function __construct()
+    {
+        parent::__construct('Routes directory path is not set');
+    }
+}

src/Mapper.php

@@ -27,6 +27,10 @@ public function match() : void
         // @todo добавить проверку на существование плейсхолдера с выбросом исключения
         if (!empty($this->fillable['where'])) {
             foreach($this->fillable['where'] as $key => $condition) {
+                if ($this->hasPlaceholderType($condition)) {
+                    $pattern = str_replace('{$' . $key . '}', $this->getPlaceholderRegExp($condition), $pattern);
+                    continue;
+                }
                 $pattern = str_replace('{$' . $key . '}', $condition, $pattern);
             }
         }

src/Request.php

@@ -4,22 +4,20 @@
 
 namespace Marussia\Router;
 
-use Marussia\Router\Contracts\RequestInterface;
-
-class Request implements RequestInterface
+class Request
 {
     private $method;
-    
+
     private $uri = '/';
 
     public function __construct(string $uri, string $method, string $host, string $protocol)
     {
         $this->method = strtoupper($method);
-        
+
         $this->host = $host;
-        
+
         $this->protocol = $protocol;
-        
+
         if (!empty($uri) && $uri !== '/') {
             $this->uri = preg_replace('(\?.*$)', '', trim($uri, '/'));
         }
@@ -29,27 +27,27 @@ public function getUri() : string
     {
         return $this->uri;
     }
-    
-    public function setUri(string $uri)
+
+    public function replaceUri(string $uri)
     {
         $this->uri = $uri;
     }
-    
+
     public function getMethod() : string
     {
         return $this->method;
     }
-    
+
     public function isMethod(string $method) : bool
     {
         return $this->method === strtoupper($method);
     }
-    
+
     public function getHost() : string
     {
         return $this->host;
     }
-    
+
     public function getProtocol() : string
     {
         return $this->protocol;