Merge pull request #53 from sunrise-php/release/v2.3.0

Named patterns
sunrise-php · Mar 17, 2020 · f3ac5e9 · f3ac5e9
2 parents 3335df3 + 594ba20
commit f3ac5e9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/functions/path_parse.php b/functions/path_parse.php
@@ -52,6 +52,16 @@
     '_' => 1,
 ];
 
+/**
+ * Named patters
+ *
+ * @var array
+ */
+const NAMED_PATTERNS = [
+    '@slug' => '[\da-z-]+',
+    '@uuid' => '[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}',
+];
+
 /**
  * Parses the given path
  *
@@ -169,6 +179,10 @@ function path_parse(string $path) : array
                 );
             }
 
+            if (isset(NAMED_PATTERNS[$attributes[$attributeIndex]['pattern']])) {
+                $attributes[$attributeIndex]['pattern'] = NAMED_PATTERNS[$attributes[$attributeIndex]['pattern']];
+            }
+
             $cursorInPattern = false;
 
             $attributes[$attributeIndex]['raw'] .= $char;

diff --git a/tests/Functions/PathParseTest.php b/tests/Functions/PathParseTest.php
@@ -14,6 +14,11 @@
 use function Sunrise\Http\Router\path_parse;
 use function chr;
 
+/**
+ * Import constants
+ */
+use const Sunrise\Http\Router\NAMED_PATTERNS;
+
 /**
  * PathParseTest
  */
@@ -60,6 +65,37 @@ public function testParsePath() : void
         $this->assertSame($expected, path_parse($path));
     }
 
+    /**
+     * @return void
+     */
+    public function testNamedPatterns() : void
+    {
+        $path = '/{foo<@slug>}/{bar<@uuid>}';
+
+        $expected = [
+            [
+                'raw' => '{foo<@slug>}',
+                'withParentheses' => null,
+                'name' => 'foo',
+                'pattern' => NAMED_PATTERNS['@slug'],
+                'isOptional' => false,
+                'startPosition' => 1,
+                'endPosition' => 12,
+            ],
+            [
+                'raw' => '{bar<@uuid>}',
+                'withParentheses' => null,
+                'name' => 'bar',
+                'pattern' => NAMED_PATTERNS['@uuid'],
+                'isOptional' => false,
+                'startPosition' => 14,
+                'endPosition' => 25,
+            ],
+        ];
+
+        $this->assertSame($expected, path_parse($path));
+    }
+
     /**
      * @return void
      */