Make leading backslash in FQN optional. Fix #10

`{% types foo: "Exception" }` is now valid.

Author: drjayvee

CHANGELOG

@@ -1,3 +1,6 @@
+# 3.1.1
+ * Feature (/ bugfix 😉): leading backslash in FQN is optional
+
 # 3.1.0
  * Feature: Detect invalid named arguments in macro calls
 

README.md

@@ -145,7 +145,7 @@ Here's the list of types supported by TwigQI:
 * Scalar: `string`, `number`, `boolean`, `null`, `object` (although a class is preferred)
 * Classes, interfaces and traits
 
-  Use FQNs with a starting backslash. Note that backslashes must be escaped in Twig strings [until v4](https://github.com/twigphp/Twig/pull/4199).
+  FQNs _may_ contain a leading backslash. Note that backslashes must be escaped in Twig strings [until v4](https://github.com/twigphp/Twig/pull/4199).
 * Three types of iterables, with increasing specificity
   * `iterable` declares nothing more or less than that the variable is iterable
   * `iterable<ValueType>` declares the values' type

composer.json

@@ -8,7 +8,7 @@
             "name": "Jeroen Versteeg"
         }
     ],
-    "version": "3.1.0",
+    "version": "3.1.1",
     "autoload": {
         "psr-4": {
             "AlisQI\\TwigQI\\": "src/"

composer.lock

@@ -29,7 +29,7 @@ class InvalidTypes implements NodeVisitorInterface
         'float' => 'number',
     ];
 
-    private const FQN_REGEX = '/^\\\\[A-Za-z_][A-Za-z0-9_]*(\\\\[A-Za-z_][A-Za-z0-9_]*)*$/';
+    private const FQN_REGEX = '/^(\\\\)?[A-Za-z_][A-Za-z0-9_]*(\\\\[A-Za-z_][A-Za-z0-9_]*)*$/';
 
     public function __construct(
         private readonly LoggerInterface $logger,

src/Inspection/InvalidTypes.php

@@ -26,6 +26,7 @@ public static function getConstants(): array
             ['DATE_W3C', true],
             ['DateTime', false],
             ['DateTime::W3C', true],
+            ['\\\\DateTime::W3C', true],
             ['DateTime::NOPE', false],
             ['Twig\\\\Token::ARROW_TYPE', true],
             ['Twig\\\\Token::NOPE', false],

tests/InvalidConstantTest.php

@@ -280,6 +280,21 @@ public function test_itValidatesDotOperationOnObjectsEvenIfNullable(string $type
         );
     }
 
+    public function test_itSupportsFQNWithoutLeadingSlash(): void
+    {
+        $this->env->createTemplate(
+            <<<EOF
+            {% types {foo: 'Exception'} %}
+            {{ foo.message }}
+        EOF
+        );
+
+        self::assertEmpty(
+            $this->errors,
+            "FQN without leading slash should be accepted"
+        );
+    }
+    
     public static function getAttributeShorthands(): array
     {
         $dummyClassFqn = '\\\\AlisQI\\\\TwigQI\\\\Tests\\\\Type\\\\Dummy';

tests/InvalidDotOperationTest.php

@@ -22,10 +22,11 @@ protected function createUniqueExtensionClass(LoggerInterface $logger): Extensio
 
     public static function getEnomCases(): array
     {
-        $enum = '\\\\AlisQI\\\\TwigQI\\\\Tests\\\\Type\\\\Enom';
+        $enum = 'AlisQI\\\\TwigQI\\\\Tests\\\\Type\\\\Enom';
 
         return [
             [$enum, 'This', true],
+            ["\\\\$enum", 'This', true],
             [$enum, 'That', true],
             [$enum, 'Invalid', false],
             [$enum, 'cases', true],

tests/InvalidEnumCaseTest.php

@@ -37,12 +37,13 @@ public static function getTypes(): array
             ["any", false],
             ["resource", false],
 
-            ["\\\\Exception", true],
-            ["\\\\Iterator", true],
+            ["\\\\Exception", true], // class
+            ["\\\\Iterator", true], // interface
             ["\\\\AlisQI\\\\TwigQI\\\\Tests\\\\Type\\\\Enom", true],
             ["\\\\AlisQI\\\\TwigQI\\\\Tests\\\\Type\\\\Traet", true],
             ["\\\\Twig\\\\Token", true],
-            ["Exception", false],
+            ["Exception", true], // leading \ is optional
+            ["Twig\\\\Token", true],
             ["\\\\Foo", false],
             ["\\\\Inv alid", false],
             ["\\\\Inv-alid", false],