-

azjezz · azjezz · commit af65f04d5b07 · 2021-06-08T04:29:06.000+01:00
Signed-off-by: azjezz &lt;azjezz@protonmail.com&gt;
diff --git a/src/Cache/ApcuCache.php b/src/Cache/ApcuCache.php
@@ -6,7 +6,6 @@
 
 use Psl;
 use HackRouting\PrefixMatching\PrefixMap;
-use Psl\SecureRandom;
 
 /**
  * @template TResponder
@@ -27,7 +26,6 @@ public function __construct()
      */
     public function get(string $item, callable $callback): array
     {
-        $item = '/hack-routing/' . $item . '/prefix-map';
         /** @var false|array<non-empty-string, PrefixMap<TResponder>> $result */
         $result = apcu_fetch($item, $success);
         if ($success && false !== $result) {
diff --git a/src/PatternParser/tokenize.php b/src/PatternParser/tokenize.php
@@ -4,17 +4,17 @@
 
 namespace HackRouting\PatternParser;
 
-use Psl\Str\Byte;
-use Psl\Vec;
+use function array_filter;
+use function str_split;
 
 /**
- * @return list<Token>
+ * @return array<int, Token>
  */
 function tokenize(string $pattern): array
 {
     $tokens = [];
     $buffer = '';
-    foreach (Byte\chunk($pattern) as $byte) {
+    foreach (str_split($pattern) as $byte) {
         if (Token::isValidType($byte)) {
             $tokens[] = new Token(Token::TYPE_STRING, $buffer);
             $buffer = '';
@@ -28,7 +28,7 @@ function tokenize(string $pattern): array
         $tokens[] = new Token(Token::TYPE_STRING, $buffer);
     }
 
-    return Vec\filter(
+    return array_filter(
         $tokens,
         static fn (Token $t): bool => !($t->getType() === Token::TYPE_STRING && $t->getValue() === '')
     );
diff --git a/src/Resolver/PrefixMatchingResolver.php b/src/Resolver/PrefixMatchingResolver.php
@@ -6,15 +6,12 @@
 
 use HackRouting\HttpException\NotFoundException;
 use HackRouting\PrefixMatching\PrefixMap;
-
-use function array_filter;
 use function array_merge;
+use function is_string;
 use function preg_match;
 use function strlen;
 use function substr;
 
-use const ARRAY_FILTER_USE_KEY;
-
 /**
  * @template TResponder
  *
@@ -50,13 +47,14 @@ public static function fromFlatMap(array $map): PrefixMatchingResolver
             /**
              * @param array<string, Tr> $flat_map
              */
-            static fn (array $flat_map): PrefixMap => PrefixMap::fromFlatMap($flat_map),
+            static fn(array $flat_map): PrefixMap => PrefixMap::fromFlatMap($flat_map),
             $map,
         ));
     }
 
     /**
      * @param non-empty-string $method
+     * @param non-empty-string $path
      *
      * @return array{0: TResponder, array<string, string>}
      *
@@ -69,17 +67,20 @@ public function resolve(string $method, string $path): array
             throw new NotFoundException();
         }
 
-        return $this->resolveWithMap($path, $map);
+        return self::resolveWithMap($path, $map);
     }
 
     /**
-     * @param PrefixMap<TResponder> $map
+     * @template T
      *
-     * @return array{0: TResponder, array<string, string>}
+     * @param non-empty-string $path
+     * @param PrefixMap<T> $map
+     *
+     * @return array{0: T, array<string, string>}
      *
      * @throws NotFoundException
      */
-    private function resolveWithMap(string $path, PrefixMap $map): array
+    private static function resolveWithMap($path, $map)
     {
         if (isset($map->literals[$path])) {
             return [$map->literals[$path], []];
@@ -88,7 +89,7 @@ private function resolveWithMap(string $path, PrefixMap $map): array
         if ($prefixes = $map->prefixes) {
             $prefix = substr($path, 0, $map->getPrefixLength());
             if (isset($prefixes[$prefix])) {
-                return $this->resolveWithMap(
+                return self::resolveWithMap(
                     substr($path, $map->prefixLength),
                     $prefixes[$prefix],
                 );
@@ -104,18 +105,19 @@ private function resolveWithMap(string $path, PrefixMap $map): array
             $remaining = substr($path, strlen($matched));
 
             /** @var array<string, string> $data */
-            $data = array_filter($matches, 'is_string', ARRAY_FILTER_USE_KEY);
-
-            if ($sub->isResponder()) {
-                if ($remaining === '') {
-                    return [$sub->getResponder(), $data];
+            $data = [];
+            foreach ($matches as $name => $match) {
+                if (is_string($name)) {
+                    $data[$name] = $match;
                 }
+            }
 
-                continue;
+            if ($remaining === '') {
+                return [$sub->getResponder(), $data];
             }
 
             try {
-                [$responder, $sub_data] = $this->resolveWithMap($remaining, $sub->getMap());
+                [$responder, $sub_data] = self::resolveWithMap($remaining, $sub->getMap());
             } catch (NotFoundException) {
                 continue;
             }
