Merge pull request #360 from skipperbent/v3-development

Version 3.4.11.0
skipperbent · Feb 14, 2018 · 3ba9dd0 · 3ba9dd0
2 parents bbb8133 + 932dfbf
commit 3ba9dd0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,12 @@
     "simple-php-router",
     "laravel",
     "pecee",
-    "php"
+    "php",
+    "framework",
+    "url-handling",
+    "input-handler",
+    "routing-engine",
+    "request-handler"
   ],
   "license": "MIT",
   "support": {

diff --git a/helpers.php b/helpers.php
@@ -18,6 +18,7 @@
  * @param string|array|null $parameters
  * @param array|null $getParams
  * @return string
+ * @throws \InvalidArgumentException
  */
 function url($name = null, $parameters = null, $getParams = null)
 {

diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php
@@ -28,15 +28,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      */
     public function loadMiddleware(Request $request)
     {
-        $max = count($this->getMiddlewares());
-
-        if ($max === 0) {
-            return;
-        }
-
-        for ($i = 0; $i < $max; $i++) {
-
-            $middleware = $this->getMiddlewares()[$i];
+        foreach ($this->getMiddlewares() as $middleware) {
 
             if (is_object($middleware) === false) {
                 $middleware = $this->loadClass($middleware);

diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php
@@ -543,7 +543,7 @@ public function setMiddlewares(array $middlewares)
     }
 
     /**
-     * @return string|array
+     * @return array
      */
     public function getMiddlewares()
     {

diff --git a/src/Pecee/SimpleRouter/Router.php b/src/Pecee/SimpleRouter/Router.php
@@ -16,12 +16,6 @@
 class Router
 {
 
-    /**
-     * The instance of this class
-     * @var static
-     */
-    protected static $instance;
-
     /**
      * Current request
      * @var Request
@@ -119,15 +113,12 @@ public function addRoute(IRoute $route)
     protected function processRoutes(array $routes, IGroupRoute $group = null, IRoute $parent = null)
     {
         // Loop through each route-request
-        $max = count($routes) - 1;
 
         $exceptionHandlers = [];
 
         $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
 
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $routes[$i];
+        foreach ($routes as $route) {
 
             if ($parent !== null) {
 
@@ -202,15 +193,9 @@ protected function processRoutes(array $routes, IGroupRoute $group = null, IRout
     public function loadRoutes()
     {
         /* Initialize boot-managers */
-        if (count($this->bootManagers) !== 0) {
-
-            $max = count($this->bootManagers) - 1;
-
-            /* @var $manager IRouterBootManager */
-            for ($i = $max; $i >= 0; $i--) {
-                $manager = $this->bootManagers[$i];
-                $manager->boot($this->request);
-            }
+        /* @var $manager IRouterBootManager */
+        foreach ($this->bootManagers as $manager) {
+            $manager->boot($this->request);
         }
 
         /* Loop through each route-request */
@@ -243,12 +228,9 @@ public function routeRequest($rewrite = false)
 
             $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri()->getPath();
 
-            $max = count($this->processedRoutes) - 1;
-
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
+            foreach ($this->processedRoutes as $key => $route) {
 
-                $route = $this->processedRoutes[$i];
 
                 /* If the route matches */
                 if ($route->matchRoute($url, $this->request) === true) {
@@ -273,7 +255,7 @@ public function routeRequest($rewrite = false)
                     $rewriteUrl = $this->request->getRewriteUrl();
 
                     if ($rewriteUrl !== null && $rewriteUrl !== $url) {
-                        unset($this->processedRoutes[$i]);
+                        unset($this->processedRoutes[$key]);
                         $this->processedRoutes = array_values($this->processedRoutes);
 
                         return $this->routeRequest(true);
@@ -388,12 +370,8 @@ public function arrayToParams(array $getParams = [], $includeEmpty = true)
      */
     public function findRoute($name)
     {
-        $max = count($this->processedRoutes) - 1;
-
         /* @var $route ILoadableRoute */
-        for ($i = $max; $i >= 0; $i--) {
-
-            $route = $this->processedRoutes[$i];
+        foreach ($this->processedRoutes as $route) {
 
             /* Check if the name matches with a name on the route. Should match either router alias or controller alias. */
             if ($route->hasName($name)) {
@@ -492,12 +470,8 @@ public function getUrl($name = null, $parameters = null, $getParams = null)
 
             /* Loop through all the routes to see if we can find a match */
 
-            $max = count($this->processedRoutes) - 1;
-
             /* @var $route ILoadableRoute */
-            for ($i = $max; $i >= 0; $i--) {
-
-                $route = $this->processedRoutes[$i];
+            foreach ($this->processedRoutes as $route) {
 
                 /* Check if the route contains the name/alias */
                 if ($route->hasName($controller) === true) {

diff --git a/src/Pecee/SimpleRouter/SimpleRouter.php b/src/Pecee/SimpleRouter/SimpleRouter.php
@@ -367,7 +367,7 @@ public static function error(\Closure $callback)
      * @param string|null $name
      * @param string|array|null $parameters
      * @param array|null $getParams
-     * @throws \Exception
+     * @throws \InvalidArgumentException
      * @return string
      */
     public static function getUrl($name = null, $parameters = null, $getParams = null)