Fix code style issues

Author: jaapio

src/DocBlock/StandardTagFactory.php

@@ -13,47 +13,47 @@
 
 namespace phpDocumentor\Reflection\DocBlock;
 
-use function trim;
-use function count;
-use function strpos;
-use function sprintf;
-use ReflectionMethod;
-use function get_class;
-use function is_object;
-use function preg_match;
-use ReflectionNamedType;
-use ReflectionParameter;
-use function array_merge;
-use function array_slice;
-use Webmozart\Assert\Assert;
 use InvalidArgumentException;
-use function array_key_exists;
-use function call_user_func_array;
-use phpDocumentor\Reflection\FqsenResolver;
-use phpDocumentor\Reflection\DocBlock\Tags\Uses;
-use phpDocumentor\Reflection\DocBlock\Tags\Var_;
-use phpDocumentor\Reflection\DocBlock\Tags\Mixin;
-use phpDocumentor\Reflection\DocBlock\Tags\Param;
-use phpDocumentor\Reflection\DocBlock\Tags\Since;
 use phpDocumentor\Reflection\DocBlock\Tags\Author;
 use phpDocumentor\Reflection\DocBlock\Tags\Covers;
-use phpDocumentor\Reflection\DocBlock\Tags\Method;
-use phpDocumentor\Reflection\DocBlock\Tags\Source;
-use phpDocumentor\Reflection\DocBlock\Tags\Throws;
-use phpDocumentor\Reflection\DocBlock\Tags\Generic;
-
-use phpDocumentor\Reflection\DocBlock\Tags\Return_;
-use phpDocumentor\Reflection\DocBlock\Tags\Version;
-use phpDocumentor\Reflection\DocBlock\Tags\Property;
 use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
+use phpDocumentor\Reflection\DocBlock\Tags\Generic;
 use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Method;
+use phpDocumentor\Reflection\DocBlock\Tags\Mixin;
+use phpDocumentor\Reflection\DocBlock\Tags\Param;
+use phpDocumentor\Reflection\DocBlock\Tags\Property;
 use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead;
 use phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite;
+use phpDocumentor\Reflection\DocBlock\Tags\Return_;
 use phpDocumentor\Reflection\DocBlock\Tags\See as SeeTag;
-use phpDocumentor\Reflection\Types\Context as TypeContext;
-use phpDocumentor\Reflection\DocBlock\Tags\Factory\Factory;
-use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Since;
+use phpDocumentor\Reflection\DocBlock\Tags\Source;
 use phpDocumentor\Reflection\DocBlock\Tags\TemplateCovariant;
+use phpDocumentor\Reflection\DocBlock\Tags\Throws;
+use phpDocumentor\Reflection\DocBlock\Tags\Uses;
+use phpDocumentor\Reflection\DocBlock\Tags\Var_;
+use phpDocumentor\Reflection\DocBlock\Tags\Version;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\Types\Context as TypeContext;
+use ReflectionMethod;
+use ReflectionNamedType;
+use ReflectionParameter;
+use Webmozart\Assert\Assert;
+
+use function array_key_exists;
+use function array_merge;
+use function array_slice;
+use function call_user_func_array;
+use function count;
+use function get_class;
+use function is_object;
+use function preg_match;
+use function sprintf;
+use function strpos;
+use function trim;
 
 /**
  * Creates a Tag object given the contents of a tag.

src/DocBlock/Tags/Extends_.php

@@ -14,14 +14,14 @@
 namespace phpDocumentor\Reflection\DocBlock\Tags;
 
 use Doctrine\Deprecations\Deprecation;
-use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\DocBlock\Description;
-use phpDocumentor\Reflection\DocBlock\Tags\TagWithType;
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\Type;
 
 /**
  * Reflection class for a {@}extends tag in a Docblock.
  */
-class Extends_ extends TagWithType 
+class Extends_ extends TagWithType
 {
     public function __construct(Type $type, ?Description $description = null)
     {
@@ -34,14 +34,15 @@ public function __construct(Type $type, ?Description $description = null)
      * @deprecated Create using static factory is deprecated,
      *  this method should not be called directly by library consumers
      */
-    public static function create(string $body)
+    public static function create(string $body): ?Tag
     {
         Deprecation::trigger(
             'phpdocumentor/reflection-docblock',
             'https://github.com/phpDocumentor/ReflectionDocBlock/issues/361',
             'Create using static factory is deprecated, this method should not be called directly
              by library consumers',
         );
+
         return null;
     }
 }

src/DocBlock/Tags/Factory/AbstractExtendsFactory.php

@@ -4,29 +4,16 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
 
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 
 /**
  * @internal This class is not part of the BC promise of this library.
  */
 abstract class AbstractImplementsFactory implements PHPStanFactory
 {
-    private DescriptionFactory $descriptionFactory;
-    private TypeResolver $typeResolver;
-    protected string $tagName;
-
-    public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
-    {
-        $this->descriptionFactory = $descriptionFactory;
-        $this->typeResolver = $typeResolver;
-    }
 
-    public function supports(PhpDocTagNode $node, Context $context): bool
-    {
-        return $node->value instanceof ImplementsTagValueNode && $node->name === $this->tagName;
-    }
 }

src/DocBlock/Tags/Factory/AbstractImplementsFactory.php

@@ -4,24 +4,34 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
 
-use Webmozart\Assert\Assert;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Extends_;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use phpDocumentor\Reflection\DocBlock\Tags\Extends_;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
 
 /**
  * @internal This class is not part of the BC promise of this library.
  */
-final class ExtendsFactory extends AbstractExtendsFactory
+final class ExtendsFactory implements PHPStanFactory
 {
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
     public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
     {
-        parent::__construct($typeResolver, $descriptionFactory);
-        $this->tagName = '@extends';
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ExtendsTagValueNode && $node->name === '@extends';
     }
 
     public function create(PhpDocTagNode $node, Context $context): Tag
@@ -36,7 +46,7 @@ public function create(PhpDocTagNode $node, Context $context): Tag
 
         return new Extends_(
             $this->typeResolver->createType($tagValue->type, $context),
-            $this->descriptionFactory->create($description, $context) 
+            $this->descriptionFactory->create($description, $context)
         );
     }
 }

src/DocBlock/Tags/Factory/ExtendsFactory.php

@@ -4,24 +4,34 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
 
-use Webmozart\Assert\Assert;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Implements_;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use phpDocumentor\Reflection\DocBlock\Tags\Implements_;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ImplementsTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
 
 /**
  * @internal This class is not part of the BC promise of this library.
  */
 final class ImplementsFactory extends AbstractImplementsFactory
 {
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
     public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
     {
-        parent::__construct($typeResolver, $descriptionFactory);
-        $this->tagName = '@implements';
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ImplementsTagValueNode && $node->name === '@implements';
     }
 
     public function create(PhpDocTagNode $node, Context $context): Tag
@@ -36,7 +46,7 @@ public function create(PhpDocTagNode $node, Context $context): Tag
 
         return new Implements_(
             $this->typeResolver->createType($tagValue->type, $context),
-            $this->descriptionFactory->create($description, $context) 
+            $this->descriptionFactory->create($description, $context)
         );
     }
 }

src/DocBlock/Tags/Factory/ImplementsFactory.php

@@ -4,24 +4,34 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
 
-use Webmozart\Assert\Assert;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\TemplateExtends;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ExtendsTagValueNode;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
-use phpDocumentor\Reflection\DocBlock\Tags\TemplateExtends;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
 
 /**
  * @internal This class is not part of the BC promise of this library.
  */
-final class TemplateExtendsFactory extends AbstractExtendsFactory
+final class TemplateExtendsFactory implements PHPStanFactory
 {
+    private DescriptionFactory $descriptionFactory;
+    private TypeResolver $typeResolver;
+
     public function __construct(TypeResolver $typeResolver, DescriptionFactory $descriptionFactory)
     {
-        parent::__construct($typeResolver, $descriptionFactory);
-        $this->tagName = '@template-extends';
+        $this->descriptionFactory = $descriptionFactory;
+        $this->typeResolver = $typeResolver;
+    }
+
+    public function supports(PhpDocTagNode $node, Context $context): bool
+    {
+        return $node->value instanceof ExtendsTagValueNode && $node->name === '@template-extends';
     }
 
     public function create(PhpDocTagNode $node, Context $context): Tag
@@ -36,7 +46,7 @@ public function create(PhpDocTagNode $node, Context $context): Tag
 
         return new TemplateExtends(
             $this->typeResolver->createType($tagValue->type, $context),
-            $this->descriptionFactory->create($description, $context) 
+            $this->descriptionFactory->create($description, $context)
         );
     }
 }

src/DocBlock/Tags/Factory/TemplateExtendsFactory.php

@@ -4,14 +4,16 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
 
-use Webmozart\Assert\Assert;
+use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Template;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
-use phpDocumentor\Reflection\DocBlock\Tags\Template;
-use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
+use Webmozart\Assert\Assert;
+
+use function is_string;
 
 /**
  * @internal This class is not part of the BC promise of this library.
@@ -30,18 +32,23 @@ public function __construct(TypeResolver $typeResolver, DescriptionFactory $desc
     public function create(PhpDocTagNode $node, Context $context): Tag
     {
         $tagValue = $node->value;
+
         Assert::isInstanceOf($tagValue, TemplateTagValueNode::class);
+        $name = $tagValue->name;
+        if ($name === '') {
+            throw new \InvalidArgumentException('Template name cannot be empty');
+        }
 
         $description = $tagValue->getAttribute('description');
         if (is_string($description) === false) {
             $description = $tagValue->description;
         }
 
         return new Template(
-            $tagValue->name,
+            $name,
             $this->typeResolver->createType($tagValue->bound, $context),
             $this->typeResolver->createType($tagValue->default, $context),
-            $this->descriptionFactory->create($description, $context) 
+            $this->descriptionFactory->create($description, $context)
         );
     }