Leverage str_starts_with(), str_ends_with() and str_contains()

Author: fancyweb

AbstractBrowser.php

@@ -604,7 +604,7 @@ public function restart()
     protected function getAbsoluteUri(string $uri): string
     {
         // already absolute?
-        if (0 === strpos($uri, 'http://') || 0 === strpos($uri, 'https://')) {
+        if (str_starts_with($uri, 'http://') || str_starts_with($uri, 'https://')) {
             return $uri;
         }
 
@@ -618,7 +618,7 @@ protected function getAbsoluteUri(string $uri): string
         }
 
         // protocol relative URL
-        if (0 === strpos($uri, '//')) {
+        if (str_starts_with($uri, '//')) {
             return parse_url($currentUri, \PHP_URL_SCHEME).':'.$uri;
         }
 
@@ -630,7 +630,7 @@ protected function getAbsoluteUri(string $uri): string
         if ('/' !== $uri[0]) {
             $path = parse_url($currentUri, \PHP_URL_PATH);
 
-            if ('/' !== substr($path, -1)) {
+            if (!str_ends_with($path, '/')) {
                 $path = substr($path, 0, strrpos($path, '/') + 1);
             }
 

CookieJar.php

@@ -169,13 +169,13 @@ public function allValues(string $uri, bool $returnsRawValue = false): array
         foreach ($this->cookieJar as $domain => $pathCookies) {
             if ($domain) {
                 $domain = '.'.ltrim($domain, '.');
-                if ($domain != substr('.'.$parts['host'], -\strlen($domain))) {
+                if (!str_ends_with('.'.$parts['host'], $domain)) {
                     continue;
                 }
             }
 
             foreach ($pathCookies as $path => $namedCookies) {
-                if ($path != substr($parts['path'], 0, \strlen($path))) {
+                if (!str_starts_with($parts['path'], $path)) {
                     continue;
                 }