Improve combinators

Author: SerafimArts

libs/phpdoc/src/DocBlock/Combinator/AccessCombinator.php

@@ -13,7 +13,7 @@
  * Reads an access level, that is one of the "public", "protected" or
  * "private" keywords.
  *
- * @implements CombinatorInterface<Visibility>
+ * @template-implements CombinatorInterface<Visibility>
  */
 final readonly class AccessCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/AuthorNameCombinator.php

@@ -11,7 +11,7 @@
 /**
  * Reads an author name, that is everything up to an optional "<email>".
  *
- * @implements CombinatorInterface<non-empty-string>
+ * @template-implements CombinatorInterface<non-empty-string>
  */
 final readonly class AuthorNameCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/CallableTypeCombinator.php

@@ -4,7 +4,6 @@
 
 namespace TypeLang\PhpDoc\DocBlock\Combinator;
 
-use TypeLang\Parser\TypeParserInterface;
 use TypeLang\PhpDoc\DocBlock\Reference\TypeReference;
 use TypeLang\PhpDoc\Parser\Grammar\CombinatorInterface;
 use TypeLang\PhpDoc\Parser\Grammar\Cursor;
@@ -14,23 +13,15 @@
 /**
  * Reads a type and accepts it only when it is a callable, so that a plain word
  * (which would parse as a type) is left for the following combinators.
- *
- * @implements CombinatorInterface<TypeReference>
  */
-final readonly class CallableTypeCombinator implements CombinatorInterface
+final readonly class CallableTypeCombinator extends TypeCombinator
 {
     public const string NAME = 'CallableType';
 
-    private TypeCombinator $types;
-
-    public function __construct(TypeParserInterface $types)
-    {
-        $this->types = new TypeCombinator($types);
-    }
-
+    #[\Override]
     public function __invoke(Cursor $cursor): TypeReference
     {
-        $type = ($this->types)($cursor);
+        $type = parent::__invoke($cursor);
 
         if (!$type->type instanceof CallableTypeNode) {
             throw new NoMatchException('Expected a callable type');

libs/phpdoc/src/DocBlock/Combinator/DescriptionCombinator.php

@@ -17,7 +17,7 @@
  * There is nothing to read when only whitespace is left, so wrap it in
  * {@see OptionalityRule} to make the description optional.
  *
- * @implements CombinatorInterface<DescriptionInterface>
+ * @template-implements CombinatorInterface<DescriptionInterface>
  */
 final readonly class DescriptionCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/EmailCombinator.php

@@ -11,7 +11,7 @@
 /**
  * Reads an email address up to its closing ">".
  *
- * @implements CombinatorInterface<non-empty-string>
+ * @template-implements CombinatorInterface<non-empty-string>
  */
 final readonly class EmailCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/IntegerCombinator.php

@@ -11,7 +11,7 @@
 /**
  * Reads a non-negative integer.
  *
- * @implements CombinatorInterface<int<0, max>>
+ * @template-implements CombinatorInterface<int<0, max>>
  */
 final readonly class IntegerCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/IssueNameCombinator.php

@@ -12,7 +12,7 @@
  * Reads an issue identifier, that is a run of letters, digits, underscores,
  * dashes and dots.
  *
- * @implements CombinatorInterface<non-empty-string>
+ * @template-implements CombinatorInterface<non-empty-string>
  */
 final readonly class IssueNameCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/NameCombinator.php

@@ -11,7 +11,7 @@
 /**
  * Reads a template parameter name, that is a single identifier.
  *
- * @implements CombinatorInterface<non-empty-string>
+ * @template-implements CombinatorInterface<non-empty-string>
  */
 final readonly class NameCombinator implements CombinatorInterface
 {

libs/phpdoc/src/DocBlock/Combinator/TypeCombinator.php

@@ -16,9 +16,9 @@
  *
  * The result pairs the parsed type with the source text it was read from.
  *
- * @implements CombinatorInterface<TypeReference>
+ * @template-implements CombinatorInterface<TypeReference>
  */
-final readonly class TypeCombinator implements CombinatorInterface
+readonly class TypeCombinator implements CombinatorInterface
 {
     public const string NAME = 'Type';
 

libs/phpdoc/src/DocBlock/Combinator/UriCombinator.php

@@ -13,7 +13,7 @@
 /**
  * Reads a URI, that is a well-formed word as defined by RFC 3986.
  *
- * @implements CombinatorInterface<UriReference>
+ * @template-implements CombinatorInterface<UriReference>
  */
 final readonly class UriCombinator implements CombinatorInterface
 {