rebase

Author: TomasVotruba

tests/unit/TypeResolverTest.php

@@ -599,8 +599,4 @@ public function provideFqcn()
         ];
     }
 
-    public function tearDown()
-    {
-        \Mockery::close();
-    }
 }

tests/unit/Types/ContextFactoryTest.php

@@ -52,8 +52,8 @@ public function testReadsAliasesFromClassReflection()
                 'DocBlock' => DocBlock::class,
                 'Tag' => Tag::class,
                 'phpDocumentor' => 'phpDocumentor',
+                'TestCase' => TestCase::class,
                 ReflectionClass::class => ReflectionClass::class,
-                'TestCase' => TestCase::class
             ];
             $context = $fixture->createFromReflector(new ReflectionClass($this));
 
@@ -84,8 +84,8 @@ public function testReadsAliasesFromProvidedNamespaceAndContent()
                 'DocBlock' => DocBlock::class,
                 'Tag' => Tag::class,
                 'phpDocumentor' => 'phpDocumentor',
-                ReflectionClass::class => ReflectionClass::class,
                 'TestCase' => TestCase::class,
+                ReflectionClass::class => ReflectionClass::class,
             ];
             $context = $fixture->createForNamespace(__NAMESPACE__, file_get_contents(__FILE__));