Fix #36

ingeniasoftware · Sep 27, 2018 · 145ef60 · 145ef60
1 parent 2d899d4
commit 145ef60
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/src/Route.php b/src/Route.php
@@ -364,17 +364,17 @@ public function hasParam($name)
     }
 
     /**
-     * Build route absolute url
+     * Builds the route absolute url
      *
-     * @param  string|array $params Route parameters
+     * @param  mixed $params Route parameters
      *
      * @return string
      */
     public function buildUrl($params)
     {
         $defaults = RouteBuilder::getDefaultParams();
 
-        // Thanks for @Ihabafia for the suggest!
+        // Thanks to @Ihabafia for the suggest!
         if(is_object($params)){
             $params = (array) $params;
         }
@@ -392,16 +392,19 @@ public function buildUrl($params)
         }
 
         $path = $this->getPrefix() . '/' . $this->getPath();
-
+        $skippedOptional = null;
+
         foreach($this->params as &$param)
         {
             $name = $param->getName();
-
-            if(!$param->isOptional() && !isset($defaults[$name]) && !isset($params[$param->getName()]))
+            $isMissingRequiredField = !$param->isOptional() && !isset($defaults[$name]) && !isset($params[$param->getName()]);
+            $alreadySkippedOptionalField = $param->isOptional() && $skippedOptional !== null && (isset($defaults[$name]) || isset($params[$name]));
+
+            if( $isMissingRequiredField || $alreadySkippedOptionalField )
             {
-                throw new \Exception('Missing "' . $name .'" parameter for "' . $this->getName() . '" route');
+                throw new \Exception('Missing "' . ($skippedOptional === null ? $name : $skippedOptional) . '" parameter for "' . $this->getName() . '" route');
             }
-
+                        
             if(isset($defaults[$name]))
             {
                 $param->value = $defaults[$param->getName()];
@@ -418,10 +421,13 @@ public function buildUrl($params)
             }
             else
             {
+                $skippedOptional = $skippedOptional === null 
+                    ? $param->getName() 
+                    : $skippedOptional;
+
                 $_path = explode('/', $path);
-                array_pop($_path);
-                $path = implode('/', $_path);
-                array_pop($this->params);
+                unset($_path[array_search($param->getSegment(), $_path)]);
+                $path  = implode('/', $_path);
             }
         }