Merge pull request #3 from thunderer/docblock-autocomplete-issue

Docblock enumerations with `static` type qualifier
thunderer · Sep 28, 2019 · 96e76d6 · 96e76d6
2 parents cdf589a + 3741fc6
commit 96e76d6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -26,10 +26,10 @@ namespace X;
 use Thunder\Platenum\Enum\ConstantsEnumTrait;
 
 /**
- * @method static self ACTIVE()
- * @method static self INACTIVE()
- * @method static self SUSPENDED()
- * @method static self DISABLED()
+ * @method static static ACTIVE()
+ * @method static static INACTIVE()
+ * @method static static SUSPENDED()
+ * @method static static DISABLED()
  */
 final class AccountStatusEnum
 {
@@ -114,8 +114,8 @@ final class BooleanEnum extends AbstractConstantsEnum
 
 ```php
 /**
- * @method static self TRUE()
- * @method static self FALSE()
+ * @method static static TRUE()
+ * @method static static FALSE()
  */
 final class BooleanEnum
 {
@@ -125,8 +125,8 @@ final class BooleanEnum
 
 ```php
 /**
- * @method static self TRUE()
- * @method static self FALSE()
+ * @method static static TRUE()
+ * @method static static FALSE()
  */
 final class BooleanEnum extends AbstractDocblockEnum {}
 ```

diff --git a/src/Command/GenerateCommand.php b/src/Command/GenerateCommand.php
@@ -120,7 +120,7 @@ private function generateClassCode(string $type, string $fqcn, string $keys): st
             }
 
             $constantsEntries[] = '    private const '.strtoupper($key).' = '.$value.';';
-            $docblockEntries[] = ' * @method static self '.strtoupper($key).'()';
+            $docblockEntries[] = ' * @method static static '.strtoupper($key).'()';
             $staticEntries[] = '        \''.strtoupper($key).'\' => '.$value.';';
         }
 

diff --git a/src/Enum/DocblockEnumTrait.php b/src/Enum/DocblockEnumTrait.php
@@ -19,7 +19,7 @@ final private static function resolve(): array
             throw PlatenumException::fromMissingDocblock($class);
         }
 
-        if(\preg_match_all('~^\s+\*\s+@method\s+static\s+self\s+(?<key>\w+)\(\)$~m', $doc, $matches) < 1) {
+        if(\preg_match_all('~^\s+\*\s+@method\s+static\s+(?:self|static)\s+(?<key>\w+)\(\)$~m', $doc, $matches) < 1) {
             throw PlatenumException::fromEmptyDocblock($class);
         }
         if(\count($matches['key']) !== substr_count($doc, '@method')) {

diff --git a/tests/DocblockEnumTest.php b/tests/DocblockEnumTest.php
@@ -22,6 +22,20 @@ public function testMembers(): void
         $this->assertSame($expected, $extends::getMembersAndValues());
     }
 
+    public function testAcceptBothSelfAndStaticDocblockTypeQualifiers(): void
+    {
+        /** @var FakeEnum $enum */
+        $enum = $this->computeUniqueClassName('X');
+        eval('/**
+         * @method static self FIRST()
+         * @method static static SECOND()
+         */
+        class '.$enum.' { use '.DocblockEnumTrait::class.'; }');
+
+        $this->assertSame('FIRST', $enum::FIRST()->getValue());
+        $this->assertSame('SECOND', $enum::SECOND()->getValue());
+    }
+
     public function testExceptionDocblockNotPresent(): void
     {
         /** @var FakeEnum $enum */