Merge pull request #325 from krytenuk/fix/remove-depreciation-messages

Added typecast to stop depreciation messages
Shardj · Aug 10, 2023 · 6ff9af2 · 6ff9af2
2 parents de90587 + e5a1915
commit 6ff9af2
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/library/Zend/Controller/Router/Route/Module.php b/library/Zend/Controller/Router/Route/Module.php
@@ -258,19 +258,18 @@ public function assemble($data = [], $reset = false, $encode = true, $partial =
         unset($params[$this->_actionKey]);
 
         foreach ($params as $key => $value) {
-            $key = ($encode) ? urlencode($key) : $key;
+            $key = ($encode) ? urlencode((string) $key) : $key;
             if (is_array($value)) {
                 foreach ($value as $arrayValue) {
-                    if ($encode && !is_null($arrayValue)) {
-                        $arrayValue = urlencode($arrayValue);
-                    }
-
+
+                  $arrayValue = ($encode) ? urlencode((string) $arrayValue) : $arrayValue;
+
                     $url .= self::URI_DELIMITER . $key;
                     $url .= self::URI_DELIMITER . $arrayValue;
                 }
             } else {
                 if ($encode && is_string($value)) {
-                    $value = urlencode($value);
+                    $value = urlencode((string) $value);
                 }
                 $url .= self::URI_DELIMITER . $key;
                 $url .= self::URI_DELIMITER . $value;
@@ -279,21 +278,21 @@ public function assemble($data = [], $reset = false, $encode = true, $partial =
 
         if (!empty($url) || $action !== $this->_defaults[$this->_actionKey]) {
             if ($encode) {
-                $action = urlencode($action);
+                $action = urlencode((string) $action);
             }
             $url = self::URI_DELIMITER . $action . $url;
         }
 
         if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) {
             if ($encode) {
-                $controller = urlencode($controller);
+                $controller = urlencode((string) $controller);
             }
             $url = self::URI_DELIMITER . $controller . $url;
         }
 
         if (isset($module)) {
             if ($encode) {
-                $module = urlencode($module);
+                $module = urlencode((string) $module);
             }
             $url = self::URI_DELIMITER . $module . $url;
         }