Bugfix

tempestphp · Mar 23, 2024 · d108d8a · d108d8a
1 parent 8cec641
commit d108d8a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/Languages/Php/Patterns/ParameterTypePattern.php b/src/Languages/Php/Patterns/ParameterTypePattern.php
@@ -14,13 +14,14 @@
 #[PatternTest(input: '?Bar $bar, Baz $baz', output: ['?Bar', 'Baz'])]
 #[PatternTest(input: 'Foo|Bar|null $bar', output: 'Foo|Bar|null')]
 #[PatternTest(input: '|null $bar', output: '|null')]
+#[PatternTest(input: 'string|\Stringable $bar', output: 'string|\Stringable')]
 final readonly class ParameterTypePattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return '(?<match>(\([\?\w\&\|]+\)|[\?\w\|\&]+))\s\\$';
+        return '(?<match>(\([\\\\\?\w\&\|]+\)|[\\\\\?\w\|\&]+))\s\\$';
     }
 
     public function getTokenType(): TokenType

diff --git a/src/Languages/Php/PhpLanguage.php b/src/Languages/Php/PhpLanguage.php
@@ -74,7 +74,6 @@ public function getPatterns(): array
             new KeywordPattern('__halt_compiler'),
             new KeywordPattern('abstract'),
             new KeywordPattern('and'),
-            new KeywordPattern('array'),
             new KeywordPattern('as'),
             new KeywordPattern('break'),
             new KeywordPattern('callable'),

diff --git a/tests/Languages/Php/PhpLanguageTest.php b/tests/Languages/Php/PhpLanguageTest.php
@@ -30,7 +30,7 @@ public static function data(): array
             ['$foo || $bar', '<span class="hl-variable">$foo</span> <span class="hl-operator">||</span> <span class="hl-variable">$bar</span>'],
             ['$foo <=> $bar', '<span class="hl-variable">$foo</span> <span class="hl-operator">&lt;=&gt;</span> <span class="hl-variable">$bar</span>'],
             ["public const string|\Stringable MESSAGE = 'hi';", '<span class="hl-keyword">public</span> <span class="hl-keyword">const</span> <span class="hl-type">string|\Stringable</span> <span class="hl-property">MESSAGE</span> = \'<span class="hl-value">hi</span>\';'],
-            ["public string|\Stringable \$message;", '<span class="hl-keyword">public</span> <span class="hl-type">string|\<span class="hl-type">Stringable</span></span> <span class="hl-property">$message</span>;'],
+            ["public string|\Stringable \$message;", '<span class="hl-keyword">public</span> <span class="hl-type">string|\Stringable</span> <span class="hl-property">$message</span>;'],
             ['for($x = 0; $x < 150; $x++) {', '<span class="hl-keyword">for</span>(<span class="hl-variable">$x</span> = 0; <span class="hl-variable">$x</span> &lt; 150; <span class="hl-variable">$x</span>++) {'],
             ["'namespace ';", "'<span class=\"hl-value\">namespace </span>';"],
             ["static::foo()", '<span class="hl-keyword">static</span>::<span class="hl-property">foo</span>()'],

diff --git a/tests/targets/test.md b/tests/targets/test.md
@@ -1,3 +1,6 @@
 ```php
-#[PatternTest(input: 'new Foo()', output: 'Foo')]
+    public function warning(
+        string|\Stringable $message, 
+        array $context = []
+    ): void;
 ```