Fix tests

composer.json

@@ -23,6 +23,12 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^6.4"
+        "phpunit/phpunit": "^6.4",
+        "doctrine/instantiator": "~1.0.5"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.x-dev"
+        }
     }
 }

tests/integration/DocblocksWithAnnotationsTest.php

@@ -12,6 +12,7 @@
 
 namespace phpDocumentor\Reflection;
 
+use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -19,6 +20,14 @@ use PHPUnit\Framework\TestCase;
  */
 final class DocblocksWithAnnotationsTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     public function testDocblockWithAnnotations()
     {
         $docComment = <<<DOCCOMMENT

tests/integration/InterpretingDocBlocksTest.php

@@ -12,6 +12,7 @@
 
 namespace phpDocumentor\Reflection;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
@@ -23,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class InterpretingDocBlocksTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     public function testInterpretingASimpleDocBlock()
     {
         /**

tests/integration/ReconstitutingADocBlockTest.php

@@ -12,10 +12,7 @@
 
 namespace phpDocumentor\Reflection;
 
-use phpDocumentor\Reflection\DocBlock\Description;
+use Mockery as m;
-use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
-use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Tags\See;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -23,6 +20,14 @@ use PHPUnit\Framework\TestCase;
  */
 class ReconstitutingADocBlockTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     public function testReconstituteADocBlock()
     {
         /**

tests/integration/UsingTagsTest.php

@@ -12,9 +12,9 @@
 
 namespace phpDocumentor\Reflection;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\Tag;
-use phpDocumentor\Reflection\DocBlock\Tags\See;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -22,6 +22,14 @@ use PHPUnit\Framework\TestCase;
  */
 class UsingTagsTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     public function testAddingYourOwnTagUsingAStaticMethodAsFactory()
     {
         /**

tests/unit/DocBlock/DescriptionFactoryTest.php

@@ -23,6 +23,14 @@ use PHPUnit\Framework\TestCase;
  */
 class DescriptionFactoryTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::create

tests/unit/DocBlock/DescriptionTest.php

@@ -22,6 +22,14 @@ use PHPUnit\Framework\TestCase;
  */
 class DescriptionTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::render

tests/unit/DocBlock/ExampleFinderTest.php

@@ -2,6 +2,7 @@
 
 namespace phpDocumentor\Reflection\DocBlock;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Tags\Example;
 use PHPUnit\Framework\TestCase;
 
@@ -14,6 +15,14 @@ class ExampleFinderTest extends TestCase
     /** @var ExampleFinder */
     private $fixture;
 
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     public function setUp()
     {
         $this->fixture = new ExampleFinder();

tests/unit/DocBlock/SerializerTest.php

@@ -12,6 +12,7 @@
 
 namespace phpDocumentor\Reflection\DocBlock;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock;
 use PHPUnit\Framework\TestCase;
 
@@ -21,6 +22,14 @@ use PHPUnit\Framework\TestCase;
  */
 class SerializerTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::getDocComment

tests/unit/DocBlock/StandardTagFactoryTest.php

@@ -31,6 +31,15 @@ use PHPUnit\Framework\TestCase;
  */
 class StandardTagFactoryTest extends TestCase
 {
+
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::create

tests/unit/DocBlock/Tags/AuthorTest.php

@@ -20,6 +20,13 @@ use PHPUnit\Framework\TestCase;
  */
 class AuthorTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Author::__construct
@@ -157,5 +164,4 @@ class AuthorTest extends TestCase
     {
         $this->assertNull(Author::create('dfgr<'));
     }
-
 }

tests/unit/DocBlock/Tags/CoversTest.php

@@ -26,6 +26,15 @@ use PHPUnit\Framework\TestCase;
  */
 class CoversTest extends TestCase
 {
+
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Covers::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/DeprecatedTest.php

@@ -24,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class DeprecatedTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/ExampleTest.php

@@ -2,6 +2,7 @@
 
 namespace DocBlock\Tags;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Tags\Example;
 use PHPUnit\Framework\TestCase;
 
@@ -10,6 +11,15 @@ use PHPUnit\Framework\TestCase;
  */
 class ExampleTest extends TestCase
 {
+
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::create
      * @covers ::__construct

tests/unit/DocBlock/Tags/Formatter/AlignFormatterTest.php

@@ -13,6 +13,7 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\Tags\Link;
 use phpDocumentor\Reflection\DocBlock\Tags\Param;
@@ -25,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class AlignFormatterTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::format
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\Formatter\AlignFormatter::__construct

tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php

@@ -12,6 +12,7 @@
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 
+use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\Tags\Generic;
 use PHPUnit\Framework\TestCase;
@@ -21,6 +22,14 @@ use PHPUnit\Framework\TestCase;
  */
 class PassthroughFormatterTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::format
      * @uses \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/GenericTest.php

@@ -24,6 +24,13 @@ use PHPUnit\Framework\TestCase;
  */
 class GenericTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Generic::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/LinkTest.php

@@ -24,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class LinkTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Link::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/MethodTest.php

@@ -33,6 +33,14 @@ use PHPUnit\Framework\TestCase;
  */
 class MethodTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName

tests/unit/DocBlock/Tags/ParamTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class ParamTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/PropertyReadTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class PropertyReadTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/PropertyTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class PropertyTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Property::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/PropertyWriteTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class PropertyWriteTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/ReturnTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class ReturnTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Return_::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/SeeTest.php

@@ -28,6 +28,14 @@ use PHPUnit\Framework\TestCase;
  */
 class SeeTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\See::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/SinceTest.php

@@ -24,6 +24,15 @@ use PHPUnit\Framework\TestCase;
  */
 class SinceTest extends TestCase
 {
+
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Since::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/SourceTest.php

@@ -16,7 +16,6 @@ use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context;
-use phpDocumentor\Reflection\Types\String_;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -25,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class SourceTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Source::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/ThrowsTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class ThrowsTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Throws::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/UsesTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class UsesTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Uses::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/VarTest.php

@@ -26,6 +26,14 @@ use PHPUnit\Framework\TestCase;
  */
 class VarTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Var_::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlock/Tags/VersionTest.php

@@ -24,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class VersionTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Version::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description

tests/unit/DocBlockFactoryTest.php

@@ -29,6 +29,14 @@ use PHPUnit\Framework\TestCase;
  */
 class DocBlockFactoryTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::createInstance

tests/unit/DocBlockTest.php

@@ -24,6 +24,14 @@ use PHPUnit\Framework\TestCase;
  */
 class DocBlockTest extends TestCase
 {
+    /**
+     * Call Mockery::close after each test.
+     */
+    public function tearDown()
+    {
+        m::close();
+    }
+
     /**
      * @covers ::__construct
      * @covers ::getSummary