Constants

tempestphp · Mar 16, 2024 · 65c1949 · 65c1949
1 parent 7900299
commit 65c1949
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 45 deletions.
diff --git a/...Php/Patterns/TypedConstantNamePattern.php → ...ages/Php/Patterns/ConstantNamePattern.php b/...Php/Patterns/TypedConstantNamePattern.php → ...ages/Php/Patterns/ConstantNamePattern.php
@@ -9,17 +9,25 @@
 use Tempest\Highlight\PatternTest;
 use Tempest\Highlight\Tokens\TokenType;
 
+#[PatternTest(
+    input: 'int $pad_type = STR_PAD_RIGHT,',
+    output: 'STR_PAD_RIGHT',
+)]
+#[PatternTest(
+    input: 'private const BAR = "bar";',
+    output: 'BAR',
+)]
 #[PatternTest(
     input: 'private const string BAR = ""',
     output: 'BAR',
 )]
-final readonly class TypedConstantNamePattern implements Pattern
+final readonly class ConstantNamePattern implements Pattern
 {
     use IsPattern;
 
     public function getPattern(): string
     {
-        return 'const\s[\w]+\s(?<match>[\w]+)\s=';
+        return '\b(?<match>[A-Z_]+)\b';
     }
 
     public function getTokenType(): TokenType

diff --git a/src/Languages/Php/Patterns/UntypedConstantNamePattern.php b/src/Languages/Php/Patterns/UntypedConstantNamePattern.php
diff --git a/src/Languages/Php/PhpLanguage.php b/src/Languages/Php/PhpLanguage.php
@@ -9,6 +9,7 @@
 use Tempest\Highlight\Languages\Php\Patterns\AttributeTypePattern;
 use Tempest\Highlight\Languages\Php\Patterns\ClassNamePattern;
 use Tempest\Highlight\Languages\Php\Patterns\ClassPropertyPattern;
+use Tempest\Highlight\Languages\Php\Patterns\ConstantNamePattern;
 use Tempest\Highlight\Languages\Php\Patterns\ConstantPropertyPattern;
 use Tempest\Highlight\Languages\Php\Patterns\ExtendsPattern;
 use Tempest\Highlight\Languages\Php\Patterns\FunctionCallPattern;
@@ -27,8 +28,6 @@
 use Tempest\Highlight\Languages\Php\Patterns\ReturnTypePattern;
 use Tempest\Highlight\Languages\Php\Patterns\SinglelineDocCommentPattern;
 use Tempest\Highlight\Languages\Php\Patterns\StaticClassCallPattern;
-use Tempest\Highlight\Languages\Php\Patterns\TypedConstantNamePattern;
-use Tempest\Highlight\Languages\Php\Patterns\UntypedConstantNamePattern;
 use Tempest\Highlight\Languages\Php\Patterns\UsePattern;
 
 class PhpLanguage implements Language
@@ -142,8 +141,7 @@ public function getPatterns(): array
             new NestedFunctionCallPattern(),
             new FunctionCallPattern(),
             new ConstantPropertyPattern(),
-            new UntypedConstantNamePattern(),
-            new TypedConstantNamePattern(),
+            new ConstantNamePattern(),
         ];
     }
 }
diff --git a/tests/PatternsTest.php b/tests/PatternsTest.php
@@ -4,17 +4,30 @@
 
 namespace Tempest\Highlight\Tests;
 
+use Generator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use Tempest\Highlight\Pattern;
 use Tempest\Highlight\PatternTest;
 
 final class PatternsTest extends TestCase
 {
     use TestsPatterns;
 
     #[Test]
-    public function test_patterns_with_attribute()
+    #[DataProvider('patterns')]
+    public function test_patterns_with_attribute(Pattern $pattern, PatternTest $patternTest)
+    {
+        $this->assertMatches(
+            pattern: $pattern,
+            content: htmlentities($patternTest->input),
+            expected: $patternTest->output,
+        );
+    }
+
+    public static function patterns(): Generator
     {
         $patternFiles = glob(__DIR__ . '/../src/Languages/*/Patterns/**.php');
 
@@ -29,19 +42,11 @@ public function test_patterns_with_attribute()
 
             $attributes = $reflectionClass->getAttributes(PatternTest::class);
 
-            //            if ($attributes === []) {
-            //                $this->fail("No #[PatternTest] attribute found on {$reflectionClass->getName()}");
-            //            }
-
             foreach ($attributes as $attribute) {
                 /** @var PatternTest $patternTest */
                 $patternTest = $attribute->newInstance();
 
-                $this->assertMatches(
-                    pattern: $reflectionClass->newInstance(),
-                    content: htmlentities($patternTest->input),
-                    expected: $patternTest->output,
-                );
+                yield [$reflectionClass->newInstance(), $patternTest];
             }
         }
     }