maou / simple-router

src/Router.php

Doc Comments +4 added lines

@@ -412,6 +412,10 @@
         return $functionHandler($handlerMapper[$code]);
     }
     
+    /**
+     * @param UriInterface $uri
+     * @param string $method
+     */
     protected function handleException($exception, $uri, $method)
     {
         if ($exception === $this->notFoundFuncName) {

Spacing +51 added lines, -51 removed lines

@@ -154,7 +154,7 @@ 
      * @access public
      * @param mixed $parser
      */
-    public function __construct($parser)
+    public function __construct ($parser)
     {
         $this->parser = $parser ?: new StdParser;
     }
@@ -166,7 +166,7 @@ 
      * @param Dispatcher $dispatcher
      * @return Router
      */
-    public function setDispatcher(Dispatcher $dispatcher)
+    public function setDispatcher (Dispatcher $dispatcher)
     {
         $this->dispatcher = $dispatcher;
 
@@ -180,7 +180,7 @@ 
      * @param CacheInterface $cacheEngine
      * @return Router
      */
-    public function setCacheEngine(CacheInterface $cacheEngine)
+    public function setCacheEngine (CacheInterface $cacheEngine)
     {
         $this->cacheEngine = $cacheEngine;
 
@@ -194,7 +194,7 @@ 
      * @param int $cacheTtl
      * @return Router
      */
-    public function setCacheTtl(int $cacheTtl)
+    public function setCacheTtl (int $cacheTtl)
     {
         $this->cacheTtl = $cacheTtl;
 
@@ -208,7 +208,7 @@ 
      * @param string $cacheKey
      * @return Router
      */
-    public function setCacheKey(string $cacheKey)
+    public function setCacheKey (string $cacheKey)
     {
         $this->cacheKey = $cacheKey;
         return $this;
@@ -221,7 +221,7 @@ 
      * @param string $identifier
      * @return null|Route
      */
-    public function getRoute(string $identifier)
+    public function getRoute (string $identifier)
     {
         return !empty($this->routes[$identifier]) ? $this->routes[$identifier] : null;
     }
@@ -232,7 +232,7 @@ 
      * @access public
      * @return array
      */
-    public function getRoutes()
+    public function getRoutes ()
     {
         return $this->routes;
     }
@@ -245,10 +245,10 @@ 
      * @param array $routes
      * @return Router
      */
-    public function setRoutes(array $method, array $routes)
+    public function setRoutes (array $method, array $routes)
     {
         foreach ($routes as $pattern => $handler) {
-            $this->map($method, $pattern, $handler);
+            $this->map ($method, $pattern, $handler);
         }
 
         return $this;
@@ -260,7 +260,7 @@ 
      * @access public
      * @return void
      */
-    public function getResult()
+    public function getResult ()
     {
         return $this->dispatch_result;
     }
@@ -268,19 +268,19 @@ 
     /**
      * {@inheritdoc}
      */
-    public function map($method, string $pattern, $handler)
+    public function map ($method, string $pattern, $handler)
     {
-        $method = is_array($method) ? $method : [$method];
+        $method = is_array ($method) ? $method : [$method];
 
         foreach ($method as $m) {
-            $route = $this->createRoute($m, $pattern, $handler);
+            $route = $this->createRoute ($m, $pattern, $handler);
 
             $this->routeCount++;
 
-            $this->routes[$route->getIdentifier()] = $route;
+            $this->routes[$route->getIdentifier ()] = $route;
 
-            if (is_callable($handler)) {
-                $route->bind('run', $handler);
+            if (is_callable ($handler)) {
+                $route->bind ('run', $handler);
             }
         }
 
@@ -296,9 +296,9 @@ 
      * @param mixed $handler
      * @return Route Route
      */
-    protected function createRoute(string $method, string $pattern, $handler)
+    protected function createRoute (string $method, string $pattern, $handler)
     {
-        return new Route($method, $pattern, $handler, $this->routeGroup, 'route_' . $this->routeCount);
+        return new Route ($method, $pattern, $handler, $this->routeGroup, 'route_' . $this->routeCount);
     }
 
     /**
@@ -309,7 +309,7 @@ 
      * @param array $options (default: [])
      * @return Dispatcher
      */
-    protected function routeDispatcher(callable $routeDefinitionCallback, array $options = [])
+    protected function routeDispatcher (callable $routeDefinitionCallback, array $options = [])
     {
         $options += [
             'routeParser' => 'FastRoute\\RouteParser\\Std',
@@ -322,24 +322,24 @@ 
             $routeCollector = new $options['routeCollector'](
                 new $options['routeParser'], new $options['dataGenerator']
             );
-            $routeDefinitionCallback($routeCollector);
+            $routeDefinitionCallback ($routeCollector);
     
-            return $routeCollector->getData();
+            return $routeCollector->getData ();
         };
         
         if (!empty($this->cacheEngine) && !empty($this->cacheKey)) {
-            if ($this->cacheEngine->has($this->cacheKey)) {
-                $dispatchData = $this->cacheEngine->get($this->cacheKey);
+            if ($this->cacheEngine->has ($this->cacheKey)) {
+                $dispatchData = $this->cacheEngine->get ($this->cacheKey);
                 
                 return new $options['dispatcher']($dispatchData);
             } else {
-                $dispatchData = $dispatchDataRunner();
-                $this->cacheEngine->set($this->cacheKey, $dispatchData, $this->cacheTtl);
+                $dispatchData = $dispatchDataRunner ();
+                $this->cacheEngine->set ($this->cacheKey, $dispatchData, $this->cacheTtl);
                 
                 return $dispatchData;
             }
         } else {
-            return new $options['dispatcher']($dispatchDataRunner());
+            return new $options['dispatcher']($dispatchDataRunner ());
         }
         
     }
@@ -350,19 +350,19 @@ 
      * @access protected
      * @return Dispatcher
      */
-    protected function createDispatcher()
+    protected function createDispatcher ()
     {
         if ($this->dispatcher) {
             return $this->dispatcher;
         }
 
         $routeDefinitionCallback = function (RouteCollector $r) {
-            foreach ($this->getRoutes() as $route) {
-                $r->addRoute($route->getMethod(), $route->getPattern(), $route->getIdentifier());
+            foreach ($this->getRoutes () as $route) {
+                $r->addRoute ($route->getMethod (), $route->getPattern (), $route->getIdentifier ());
             }
         };
 
-        $this->dispatcher = $this->routeDispatcher($routeDefinitionCallback, [
+        $this->dispatcher = $this->routeDispatcher ($routeDefinitionCallback, [
             'routeParser' => $this->parser,
         ]);
 
@@ -377,22 +377,22 @@ 
      * @param string $method (default: 'GET')
      * @return Route Handling Method
      */
-    public function dispatch(UriInterface $uri, $method = 'GET')
+    public function dispatch (UriInterface $uri, $method = 'GET')
     {
-        $this->dispatch_result = $this->createDispatcher()->dispatch(
+        $this->dispatch_result = $this->createDispatcher ()->dispatch (
             $method,
-            $uri->getPath()
+            $uri->getPath ()
         );
 
         $functionHandler = function ($arg) use ($uri, $method) {
-            if (method_exists($this, $arg['methodName']) || $this->hasMethod($arg['methodName'])) {
+            if (method_exists ($this, $arg['methodName']) || $this->hasMethod ($arg['methodName'])) {
                 return $this->{$arg['methodName']}(...$arg['args']);
             } else {
-                return $this->handleException($arg['methodName'], $uri, $method);
+                return $this->handleException ($arg['methodName'], $uri, $method);
             }
         };
 
-        $code = array_shift($this->dispatch_result);
+        $code = array_shift ($this->dispatch_result);
         
         $handlerMapper = [
             Dispatcher::NOT_FOUND => [
@@ -409,17 +409,17 @@ 
             ]
         ];
 
-        return $functionHandler($handlerMapper[$code]);
+        return $functionHandler ($handlerMapper[$code]);
     }
     
-    protected function handleException($exception, $uri, $method)
+    protected function handleException ($exception, $uri, $method)
     {
         if ($exception === $this->notFoundFuncName) {
-            throw new BadMethodCallException('Method : ' . ((string) $method) . ' ON uri : ' . ((string) $uri) . ' Not Allowed');
+            throw new BadMethodCallException ('Method : ' . ((string) $method) . ' ON uri : ' . ((string) $uri) . ' Not Allowed');
         } elseif ($exception === $this->forbiddenFuncName) {
-            throw new BadMethodCallException(((string) $uri) . ' Not Available');
+            throw new BadMethodCallException (((string) $uri) . ' Not Available');
         } else {
-            throw new BadMethodCallException('There is no method or exception to handle this request ' . ((string) $uri));
+            throw new BadMethodCallException ('There is no method or exception to handle this request ' . ((string) $uri));
         }
         
         return null;
@@ -432,9 +432,9 @@ 
      * @param callable $callable
      * @return Router
      */
-    public function whenNotFound(callable $callable)
+    public function whenNotFound (callable $callable)
     {
-        $this->bind($this->notFoundFuncName, $callable);
+        $this->bind ($this->notFoundFuncName, $callable);
 
         return $this;
     }
@@ -446,9 +446,9 @@ 
      * @param callable $callable
      * @return Router
      */
-    public function whenForbidden(callable $callable)
+    public function whenForbidden (callable $callable)
     {
-        $this->bind($this->forbiddenFuncName, $callable);
+        $this->bind ($this->forbiddenFuncName, $callable);
 
         return $this;
     }
@@ -461,20 +461,20 @@ 
      * @param mixed $args
      * @return void
      */
-    protected function routerRoutine($identifier, $args)
+    protected function routerRoutine ($identifier, $args)
     {
-        $route = $this->getRoute($identifier);
+        $route = $this->getRoute ($identifier);
 
         if (!empty($args)) {
             foreach ($args as &$v) {
-                $v = urldecode($v);
+                $v = urldecode ($v);
             }
         }
 
-        if ($route->hasMethod('run')) {
-            return $route->run($args);
+        if ($route->hasMethod ('run')) {
+            return $route->run ($args);
         } else {
-            return $route->setArgs($args);
+            return $route->setArgs ($args);
         }
     }
 }

src/Http/Uri.php

Spacing +57 added lines, -57 removed lines

@@ -75,7 +75,7 @@ 
      * @param string $user     Uri user.
      * @param string $password Uri password.
      */
-    public function __construct(
+    public function __construct (
         $scheme,
         $host,
         $port = null,
@@ -85,12 +85,12 @@ 
         $user = '',
         $password = ''
     ) {
-        $this->scheme = $this->filterScheme($scheme);
+        $this->scheme = $this->filterScheme ($scheme);
         $this->host = $host;
-        $this->port = $this->filterPort($port);
-        $this->path = empty($path) ? '/' : $this->filterPath($path);
-        $this->query = $this->filterQuery($query);
-        $this->fragment = $this->filterQuery($fragment);
+        $this->port = $this->filterPort ($port);
+        $this->path = empty($path) ? '/' : $this->filterPath ($path);
+        $this->query = $this->filterQuery ($query);
+        $this->fragment = $this->filterQuery ($fragment);
         $this->user = $user;
         $this->password = $password;
     }
@@ -98,7 +98,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getScheme()
+    public function getScheme ()
     {
         return $this->scheme;
     }
@@ -106,11 +106,11 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getAuthority()
+    public function getAuthority ()
     {
-        $userInfo = $this->getUserInfo();
-        $host = $this->getHost();
-        $port = $this->getPort();
+        $userInfo = $this->getUserInfo ();
+        $host = $this->getHost ();
+        $port = $this->getPort ();
 
         return ($userInfo ? $userInfo . '@' : '') . $host . ($port !== null ? ':' . $port : '');
     }
@@ -118,7 +118,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getUserInfo()
+    public function getUserInfo ()
     {
         return $this->user . ($this->password ? ':' . $this->password : '');
     }
@@ -126,7 +126,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getHost()
+    public function getHost ()
     {
         return $this->host;
     }
@@ -134,15 +134,15 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getPort()
+    public function getPort ()
     {
-        return $this->port !== null && !$this->hasStandardPort() ? $this->port : null;
+        return $this->port !== null && !$this->hasStandardPort () ? $this->port : null;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPath()
+    public function getPath ()
     {
         return $this->path;
     }
@@ -150,7 +150,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getQuery()
+    public function getQuery ()
     {
         return $this->query;
     }
@@ -158,7 +158,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getFragment()
+    public function getFragment ()
     {
         return $this->fragment;
     }
@@ -166,9 +166,9 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withScheme($scheme)
+    public function withScheme ($scheme)
     {
-        $scheme = $this->filterScheme($scheme);
+        $scheme = $this->filterScheme ($scheme);
         $clone = clone $this;
         $clone->scheme = $scheme;
 
@@ -178,7 +178,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withUserInfo($user, $password = null)
+    public function withUserInfo ($user, $password = null)
     {
         $clone = clone $this;
         $clone->user = $user;
@@ -190,7 +190,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withHost($host)
+    public function withHost ($host)
     {
         $clone = clone $this;
         $clone->host = $host;
@@ -201,9 +201,9 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withPort($port)
+    public function withPort ($port)
     {
-        $port = $this->filterPort($port);
+        $port = $this->filterPort ($port);
         $clone = clone $this;
         $clone->port = $port;
 
@@ -213,10 +213,10 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withPath($path)
+    public function withPath ($path)
     {
         $clone = clone $this;
-        $clone->path = $this->filterPath($path);
+        $clone->path = $this->filterPath ($path);
 
         return $clone;
     }
@@ -224,17 +224,17 @@ 
     /**
      * {@inheritdoc}
      */
-    public function withQuery($query)
+    public function withQuery ($query)
     {
-        return $this->withString($query);
+        return $this->withString ($query);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function withFragment($fragment)
+    public function withFragment ($fragment)
     {
-        return $this->withString($fragment, 'fragment');
+        return $this->withString ($fragment, 'fragment');
     }
     
     /**
@@ -245,14 +245,14 @@ 
      * @param string $name (default: 'query')
      * @return Uri
      */
-    protected function withString($string, $name = 'query')
+    protected function withString ($string, $name = 'query')
     {
-        if (!is_string($string) && !method_exists($string, '__toString')) {
-            throw new InvalidArgumentException('Uri fragment must be a string');
+        if (!is_string ($string) && !method_exists ($string, '__toString')) {
+            throw new InvalidArgumentException ('Uri fragment must be a string');
         }
-        $string = ltrim((string) $string, '#');
+        $string = ltrim ((string) $string, '#');
         $clone = clone $this;
-        $clone->$name = $this->filterQuery($string);
+        $clone->$name = $this->filterQuery ($string);
 
         return $clone;
     }
@@ -260,15 +260,15 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __toString()
+    public function __toString ()
     {
-        $scheme = $this->getScheme();
-        $authority = $this->getAuthority();
-        $path = $this->getPath();
-        $query = $this->getQuery();
-        $fragment = $this->getFragment();
+        $scheme = $this->getScheme ();
+        $authority = $this->getAuthority ();
+        $path = $this->getPath ();
+        $query = $this->getQuery ();
+        $fragment = $this->getFragment ();
 
-        $path = '/' . ltrim($path, '/');
+        $path = '/' . ltrim ($path, '/');
 
         return ($scheme ? $scheme . ':' : '')
             . ($authority ? '//' . $authority : '')
@@ -289,7 +289,7 @@ 
      * @return string $scheme
      * @throws InvalidArgumentException if not corret scheme is present
      */
-    protected function filterScheme(string $scheme)
+    protected function filterScheme (string $scheme)
     {
         static $valid = [
             '' => true,
@@ -297,9 +297,9 @@ 
             'http' => true,
         ];
 
-        $scheme = str_replace('://', '', strtolower($scheme));
+        $scheme = str_replace ('://', '', strtolower ($scheme));
         if (!isset($valid[$scheme])) {
-            throw new InvalidArgumentException('Uri scheme must be one of: "", "https", "http"');
+            throw new InvalidArgumentException ('Uri scheme must be one of: "", "https", "http"');
         }
 
         return $scheme;
@@ -314,14 +314,14 @@ 
      * @return null|integer $port
      * @throws InvalidArgumentException for incorrect port assigned
      */
-    protected function filterPort($port)
+    protected function filterPort ($port)
     {
         
         if ((integer) $port >= 0 && (integer) $port <= 65535) {
             return $port;
         }
 
-        throw new InvalidArgumentException('Uri port must be null or an integer between 1 and 65535 (inclusive)');
+        throw new InvalidArgumentException ('Uri port must be null or an integer between 1 and 65535 (inclusive)');
     }
 
     /**
@@ -331,12 +331,12 @@ 
      * @param string $path
      * @return string of cleared path
      */
-    protected function filterPath($path)
+    protected function filterPath ($path)
     {
-        return preg_replace_callback(
+        return preg_replace_callback (
             '/(?:[^a-zA-Z0-9_\-\.~:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
             function ($match) {
-                return rawurlencode($match[0]);
+                return rawurlencode ($match[0]);
             },
             $path
         );
@@ -349,12 +349,12 @@ 
      * @param string $query
      * @return string of replaced query
      */
-    protected function filterQuery($query)
+    protected function filterQuery ($query)
     {
-        return preg_replace_callback(
+        return preg_replace_callback (
             '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
             function ($match) {
-                return rawurlencode($match[0]);
+                return rawurlencode ($match[0]);
             },
             $query
         );
@@ -366,7 +366,7 @@ 
      * @access protected
      * @return boolean
      */
-    protected function hasStandardPort()
+    protected function hasStandardPort ()
     {
         return ($this->scheme === 'http' && $this->port === 80) || ($this->scheme === 'https' && $this->port === 443);
     }
@@ -377,10 +377,10 @@ 
      * @access public
      * @return string
      */
-    public function getBaseUrl()
+    public function getBaseUrl ()
     {
-        $scheme = $this->getScheme();
-        $authority = $this->getAuthority();
+        $scheme = $this->getScheme ();
+        $authority = $this->getAuthority ();
 
         return ($scheme ? $scheme . ':' : '')
             . ($authority ? '//' . $authority : '');

src/Factory/Uri.php

Spacing +8 added lines, -8 removed lines

@@ -14,15 +14,15 @@ 
      * @static
      * @return Resilient\Http\Uri
      */
-    public static function createFromServer($serv)
+    public static function createFromServer ($serv)
     {
         $scheme = isset($serv['HTTPS']) ? 'https://' : 'http://';
         $host = !empty($serv['HTTP_HOST']) ? $serv['HTTP_HOST'] : $serv['SERVER_NAME'];
         $port = empty($serv['SERVER_PORT']) ? $serv['SERVER_PORT'] : null;
 
-        $path = (string) parse_url('http://www.example.com/' . $serv['REQUEST_URI'], PHP_URL_PATH);
+        $path = (string) parse_url ('http://www.example.com/' . $serv['REQUEST_URI'], PHP_URL_PATH);
 
-        $query = empty($serv['QUERY_STRING']) ? parse_url('http://example.com' . $serv['REQUEST_URI'], PHP_URL_QUERY) : $serv['QUERY_STRING'];
+        $query = empty($serv['QUERY_STRING']) ? parse_url ('http://example.com' . $serv['REQUEST_URI'], PHP_URL_QUERY) : $serv['QUERY_STRING'];
 
         $fragment = '';
 
@@ -30,10 +30,10 @@ 
         $password = !empty($serv['PHP_AUTH_PW']) ? $serv['PHP_AUTH_PW'] : '';
 
         if (empty($user) && empty($password) && !empty($serv['HTTP_AUTHORIZATION'])) {
-            list($user, $password) = explode(':', base64_decode(substr($serv['HTTP_AUTHORIZATION'], 6)));
+            list($user, $password) = explode (':', base64_decode (substr ($serv['HTTP_AUTHORIZATION'], 6)));
         }
 
-        $uri = new \Resilient\Http\Uri($scheme, $host, $port, $path, $query, $fragment, $user, $password);
+        $uri = new \Resilient\Http\Uri ($scheme, $host, $port, $path, $query, $fragment, $user, $password);
 
         return $uri;
     }
@@ -47,9 +47,9 @@ 
      * @param string $uri
      * @return Resilient\Http\Uri
      */
-    public static function createFromString(string $uri)
+    public static function createFromString (string $uri)
     {
-        $parts = parse_url($uri);
+        $parts = parse_url ($uri);
         $scheme = isset($parts['scheme']) ? $parts['scheme'] : '';
         $user = isset($parts['user']) ? $parts['user'] : '';
         $pass = isset($parts['pass']) ? $parts['pass'] : '';
@@ -59,6 +59,6 @@ 
         $query = isset($parts['query']) ? $parts['query'] : '';
         $fragment = isset($parts['fragment']) ? $parts['fragment'] : '';
 
-        return new \Resilient\Http\Uri($scheme, $host, $port, $path, $query, $fragment, $user, $pass);
+        return new \Resilient\Http\Uri ($scheme, $host, $port, $path, $query, $fragment, $user, $pass);
     }
 }