Add new BaseUrl->isLocalUri and BaseUrl->isLocalUrl methods

- Deprecate Util\Network->isLocalLink to reduce dependency on DI class

diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index 40303068493f9aa810ca6dba774d7a04192ca620..cc20343d1c4f8a5659e8224ef07616c5f372ac74 100644 (file)
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -127,4 +127,14 @@ class BaseURL extends Uri implements UriInterface
                $redirectTo = $this->__toString() . '/' . ltrim($toUrl, '/');
                System::externalRedirect($redirectTo);
        }
+
+       public function isLocalUrl(string $url): bool
+       {
+               return strpos(Strings::normaliseLink($url), Strings::normaliseLink((string)$this)) === 0;
+       }
+
+       public function isLocalUri(UriInterface $uri): bool
+       {
+               return $this->isLocalUrl((string)$uri);
+       }
 }

diff --git a/src/Util/Network.php b/src/Util/Network.php
index f7ceab5433b217bbc33c2ccb98770cbaf40020f1..495510189f1a2a849f61d69ce9aacbc283750b3d 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -640,10 +640,11 @@ class Network
         * @param string $url
         *
         * @return bool
+        * @deprecated since 2023.09, please use BaseUrl->isLocalUrl or BaseUrl->isLocalUri instead.
         */
        public static function isLocalLink(string $url): bool
        {
-               return (strpos(Strings::normaliseLink($url), Strings::normaliseLink(DI::baseUrl())) !== false);
+               return DI::baseUrl()->isLocalUrl($url);
        }
 
        /**