Merge pull request Shardj#410 from muli/fix_deprecated_usage_of_strin…

…g_functions Fix deprecated usage of string functions in `BaseUrl` helper.
qofclubs · Jul 22, 2024 · 94d85ab · 94d85ab
2 parents bd0c634 + 5f6cce1
commit 94d85ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/library/Zend/Controller/Front.php b/library/Zend/Controller/Front.php
@@ -559,7 +559,7 @@ public function setBaseUrl($base = null)
     /**
      * Retrieve the currently set base URL
      *
-     * @return string
+     * @return string|null
      */
     public function getBaseUrl()
     {

diff --git a/library/Zend/View/Helper/BaseUrl.php b/library/Zend/View/Helper/BaseUrl.php
@@ -64,12 +64,12 @@ public function baseUrl($file = null)
     /**
      * Set BaseUrl
      *
-     * @param  string $base
+     * @param  string|null $base
      * @return Zend_View_Helper_BaseUrl
      */
     public function setBaseUrl($base)
     {
-        $this->_baseUrl = rtrim($base, '/\\');
+        $this->_baseUrl = rtrim($base ?? '', '/\\');
         return $this;
     }
 
@@ -97,8 +97,8 @@ public function getBaseUrl()
     /**
      * Remove Script filename from baseurl
      *
-     * @param  string $url
-     * @return string
+     * @param  string|null $url
+     * @return string|null
      */
     protected function _removeScriptName($url)
     {
@@ -107,6 +107,10 @@ protected function _removeScriptName($url)
             return $url;
         }
 
+        if ($url === null) {
+            return null;
+        }
+
         if (($pos = strripos($url, basename($_SERVER['SCRIPT_NAME']))) !== false) {
             $url = substr($url, 0, $pos);
         }