Cleanup codebase

Author: nyamsprod

interfaces/UriString.php

@@ -25,7 +25,6 @@
 use function array_merge;
 use function array_pop;
 use function array_reduce;
-use function end;
 use function explode;
 use function filter_var;
 use function implode;
@@ -420,7 +419,7 @@ public static function removeDotSegments(Stringable|string $path): string
 
         $oldSegments = explode('/', $path);
         $newPath = implode('/', array_reduce($oldSegments, $reducer(...), []));
-        if (isset(self::DOT_SEGMENTS[end($oldSegments)])) {
+        if (isset(self::DOT_SEGMENTS[$oldSegments[array_key_last($oldSegments)]])) {
             $newPath .= '/';
         }
 

uri/BaseUri.php

@@ -29,7 +29,6 @@
 use function array_pop;
 use function array_reduce;
 use function count;
-use function end;
 use function explode;
 use function implode;
 use function in_array;
@@ -517,8 +516,7 @@ final protected static function formatPath(string $path, string $basePath): stri
     final protected static function formatPathWithEmptyBaseQuery(string $path): string
     {
         $targetSegments = static::getSegments($path);
-        /** @var string $basename */
-        $basename = end($targetSegments);
+        $basename = $targetSegments[array_key_last($targetSegments)];
 
         return '' === $basename ? './' : $basename;
     }
@@ -572,7 +570,7 @@ final protected function removeDotSegments(string $path): string
 
         $oldSegments = explode('/', $path);
         $newPath = implode('/', array_reduce($oldSegments, $reducer(...), []));
-        if (isset(static::DOT_SEGMENTS[end($oldSegments)])) {
+        if (isset(static::DOT_SEGMENTS[$oldSegments[array_key_last($oldSegments)]])) {
             $newPath .= '/';
         }
 

uri/Uri.php

@@ -41,13 +41,13 @@
 use TypeError;
 
 use function array_filter;
+use function array_key_last;
 use function array_map;
 use function array_pop;
 use function base64_decode;
 use function base64_encode;
 use function class_exists;
 use function count;
-use function end;
 use function explode;
 use function feof;
 use function file_get_contents;
@@ -1836,8 +1836,7 @@ public function relativize(Stringable|string $uri): UriInterface
     private static function formatPathWithEmptyBaseQuery(string $path): string
     {
         $targetSegments = self::getSegments($path);
-        /** @var string $basename */
-        $basename = end($targetSegments);
+        $basename = $targetSegments[array_key_last($targetSegments)];
 
         return '' === $basename ? './' : $basename;
     }