Bump dependencies

Author: jaapio

composer.lock

@@ -5,6 +5,7 @@
     <file>src</file>
     <file>tests/unit</file>
     <exclude-pattern>*/tests/unit/Types/ContextFactoryTest.php</exclude-pattern>
+    <exclude-pattern>*/tests/unit/Assets/*</exclude-pattern>
     <arg value="p"/>
 
     <rule ref="phpDocumentor">

phpcs.xml.dist

@@ -17,7 +17,6 @@
 use phpDocumentor\Reflection\DocBlock\Tags\Author;
 use phpDocumentor\Reflection\DocBlock\Tags\Covers;
 use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
-use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
 use phpDocumentor\Reflection\DocBlock\Tags\Generic;
 use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
 use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
@@ -165,7 +164,7 @@ public function registerTagHandler(string $tagName, string $handler) : void
     {
         Assert::stringNotEmpty($tagName);
         Assert::classExists($handler);
-        Assert::implementsInterface($handler, StaticMethod::class);
+        Assert::implementsInterface($handler, Tag::class);
 
         if (strpos($tagName, '\\') && $tagName[0] !== '\\') {
             throw new InvalidArgumentException(

src/DocBlock/StandardTagFactory.php

@@ -48,7 +48,7 @@ final class Deprecated extends BaseTag implements Factory\StaticMethod
 
     public function __construct(?string $version = null, ?Description $description = null)
     {
-        Assert::nullOrStringNotEmpty($version);
+        Assert::nullOrNotEmpty($version);
 
         $this->version     = $version;
         $this->description = $description;

src/DocBlock/Tags/Deprecated.php

@@ -48,7 +48,7 @@ final class Since extends BaseTag implements Factory\StaticMethod
 
     public function __construct(?string $version = null, ?Description $description = null)
     {
-        Assert::nullOrStringNotEmpty($version);
+        Assert::nullOrNotEmpty($version);
 
         $this->version     = $version;
         $this->description = $description;

src/DocBlock/Tags/Since.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Assets;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
+
+final class CustomParam implements Tag, StaticMethod
+{
+    public $myParam;
+    public $fqsenResolver;
+
+    public function getName() : string
+    {
+        return 'spy';
+    }
+
+    public static function create($body, FqsenResolver $fqsenResolver = null, ?string $myParam = null)
+    {
+        $tag = new self();
+        $tag->fqsenResolver = $fqsenResolver;
+        $tag->myParam = $myParam;
+
+        return $tag;
+    }
+
+    public function render(?Formatter $formatter = null) : string
+    {
+        return $this->getName();
+    }
+
+    public function __toString() : string
+    {
+        return $this->getName();
+    }
+}

tests/unit/Assets/CustomParam.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Assets;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
+
+final class CustomServiceClass implements Tag, StaticMethod
+{
+    public $formatter;
+
+    public function getName() : string
+    {
+        return 'spy';
+    }
+
+    public static function create($body, PassthroughFormatter $formatter = null)
+    {
+        $tag = new self();
+        $tag->formatter = $formatter;
+
+        return $tag;
+    }
+
+    public function render(?Formatter $formatter = null) : string
+    {
+        return $this->getName();
+    }
+
+    public function __toString() : string
+    {
+        return $this->getName();
+    }
+}

tests/unit/Assets/CustomServiceClass.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace phpDocumentor\Reflection\Assets;
+
+use phpDocumentor\Reflection\DocBlock\Tag;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\FqsenResolver;
+use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
+
+final class CustomServiceInterface implements Tag, StaticMethod
+{
+    public $formatter;
+
+    public function getName() : string
+    {
+        return 'spy';
+    }
+
+    public static function create($body, Formatter $formatter = null)
+    {
+        $tag = new self();
+        $tag->formatter = $formatter;
+
+        return $tag;
+    }
+
+    public function render(?Formatter $formatter = null) : string
+    {
+        return $this->getName();
+    }
+
+    public function __toString() : string
+    {
+        return $this->getName();
+    }
+}

tests/unit/Assets/CustomServiceInterface.php

@@ -15,6 +15,9 @@
 
 use InvalidArgumentException;
 use Mockery as m;
+use phpDocumentor\Reflection\Assets\CustomParam;
+use phpDocumentor\Reflection\Assets\CustomServiceClass;
+use phpDocumentor\Reflection\Assets\CustomServiceInterface;
 use phpDocumentor\Reflection\DocBlock\Tags\Author;
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
@@ -169,13 +172,13 @@ public function testAddParameterToServiceLocator() : void
     {
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
+        $tagFactory->registerTagHandler('spy', CustomParam::class);
+
         $tagFactory->addParameter('myParam', 'myValue');
+        $spy = $tagFactory->create('@spy');
 
-        $this->assertAttributeSame(
-            [FqsenResolver::class => $resolver, 'myParam' => 'myValue'],
-            'serviceLocator',
-            $tagFactory
-        );
+        $this->assertSame($resolver, $spy->fqsenResolver);
+        $this->assertSame('myValue', $spy->myParam);
     }
 
     /**
@@ -190,12 +193,11 @@ public function testAddServiceToServiceLocator() : void
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
         $tagFactory->addService($service);
+        $tagFactory->registerTagHandler('spy', CustomServiceClass::class);
 
-        $this->assertAttributeSame(
-            [FqsenResolver::class => $resolver, PassthroughFormatter::class => $service],
-            'serviceLocator',
-            $tagFactory
-        );
+        $spy = $tagFactory->create('@spy');
+
+        $this->assertSame($service, $spy->formatter);
     }
 
     /**
@@ -211,12 +213,11 @@ public function testInjectConcreteServiceForInterfaceToServiceLocator() : void
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
         $tagFactory->addService($service, $interfaceName);
+        $tagFactory->registerTagHandler('spy', CustomServiceInterface::class);
 
-        $this->assertAttributeSame(
-            [FqsenResolver::class => $resolver, $interfaceName => $service],
-            'serviceLocator',
-            $tagFactory
-        );
+        $spy = $tagFactory->create('@spy');
+
+        $this->assertSame($service, $spy->formatter);
     }
 
     /**