use PHPUnit 6.0 syntax for tests

tests/unit/DocBlock/StandardTagFactoryTest.php

@@ -146,11 +146,11 @@ class StandardTagFactoryTest extends TestCase
      * @covers ::create
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The tag "@user[myuser" does not seem to be wellformed, please check it for errors
      */
     public function testExceptionIsThrownIfProvidedTagIsNotWellformed() : void
     {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('The tag "@user[myuser" does not seem to be wellformed, please check it for errors');
         $tagFactory = new StandardTagFactory(m::mock(FqsenResolver::class));
         $tagFactory->create('@user[myuser');
     }
@@ -235,13 +235,12 @@ class StandardTagFactoryTest extends TestCase
      * @covers ::registerTagHandler
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @expectedException \InvalidArgumentException
      */
     public function testHandlerRegistrationFailsIfProvidedTagNameIsNamespaceButNotFullyQualified() : void
     {
+        $this->expectException('InvalidArgumentException');
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
-
         $tagFactory->registerTagHandler('Name\Spaced\Tag', Author::class);
     }
 
@@ -249,13 +248,12 @@ class StandardTagFactoryTest extends TestCase
      * @covers ::registerTagHandler
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @expectedException \InvalidArgumentException
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerIsEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
-
         $tagFactory->registerTagHandler('my-tag', '');
     }
 
@@ -263,13 +261,12 @@ class StandardTagFactoryTest extends TestCase
      * @covers ::registerTagHandler
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @expectedException \InvalidArgumentException
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerIsNotAnExistingClassName() : void
     {
+        $this->expectException('InvalidArgumentException');
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
-
         $tagFactory->registerTagHandler('my-tag', 'IDoNotExist');
     }
 
@@ -277,13 +274,12 @@ class StandardTagFactoryTest extends TestCase
      * @covers ::registerTagHandler
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @expectedException \InvalidArgumentException
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerDoesNotImplementTheTagInterface() : void
     {
+        $this->expectException('InvalidArgumentException');
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
-
         $tagFactory->registerTagHandler('my-tag', 'stdClass');
     }
 

tests/unit/DocBlock/Tags/AuthorTest.php

@@ -97,10 +97,10 @@ class AuthorTest extends TestCase
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testInitializationFailsIfEmailIsNotValid() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Author('Mike van Riel', 'mike');
     }
 

tests/unit/DocBlock/Tags/CoversTest.php

@@ -148,10 +148,10 @@ class CoversTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(Covers::create(''));
     }
 }

tests/unit/DocBlock/Tags/GenericTest.php

@@ -127,20 +127,20 @@ class GenericTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfNameIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         Generic::create('', '');
     }
 
     /**
      * @covers ::create
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfNameContainsIllegalCharacters() : void
     {
+        $this->expectException('InvalidArgumentException');
         Generic::create('', 'name/myname');
     }
 }

tests/unit/DocBlock/Tags/MethodTest.php

@@ -366,73 +366,73 @@ class MethodTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         Method::create('');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodReturnsNullIfBodyIsIncorrect() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(Method::create('body('));
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Method::create('body');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Method::create('body', new TypeResolver());
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testCreationFailsIfBodyIsNotString() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Method([]);
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testCreationFailsIfBodyIsEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Method('');
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testCreationFailsIfStaticIsNotBoolean() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Method('body', [], null, []);
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testCreationFailsIfArgumentRecordContainsInvalidEntry() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Method('body', [ [ 'name' => 'myName', 'unknown' => 'nah' ] ]);
     }
 

tests/unit/DocBlock/Tags/ParamTest.php

@@ -182,30 +182,30 @@ class ParamTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Param::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         Param::create('', new TypeResolver(), $descriptionFactory);
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Param::create('body');
     }
 
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Param::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/PropertyReadTest.php

@@ -168,30 +168,30 @@ class PropertyReadTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         PropertyRead::create('', new TypeResolver(), $descriptionFactory);
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         PropertyRead::create('body');
     }
 
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         PropertyRead::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/PropertyTest.php

@@ -163,30 +163,30 @@ class PropertyTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Property::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         Property::create('', new TypeResolver(), $descriptionFactory);
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Property::create('body');
     }
 
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Property::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/PropertyWriteTest.php

@@ -168,30 +168,30 @@ class PropertyWriteTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         PropertyWrite::create('', new TypeResolver(), $descriptionFactory);
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         PropertyWrite::create('body');
     }
 
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         PropertyWrite::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/ReturnTest.php

@@ -144,28 +144,28 @@ class ReturnTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(Return_::create(''));
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Return_::create('body');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Return_::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/SeeTest.php

@@ -192,28 +192,28 @@ class SeeTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(See::create(''));
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         See::create('body');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         See::create('body', new FqsenResolver());
     }
 }

tests/unit/DocBlock/Tags/SourceTest.php

@@ -160,10 +160,10 @@ class SourceTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Source::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         Source::create('', $descriptionFactory);
     }
@@ -171,28 +171,28 @@ class SourceTest extends TestCase
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Source::create('1');
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testExceptionIsThrownIfStartingLineIsNotInteger() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Source('blabla');
     }
 
     /**
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function testExceptionIsThrownIfLineCountIsNotIntegerOrNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         new Source('1', []);
     }
 }

tests/unit/DocBlock/Tags/ThrowsTest.php

@@ -144,28 +144,28 @@ class ThrowsTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(Throws::create(''));
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Throws::create('body');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Throws::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlock/Tags/UsesTest.php

@@ -147,28 +147,28 @@ class UsesTest extends TestCase
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfBodyIsNotEmpty() : void
     {
+        $this->expectException('InvalidArgumentException');
         $this->assertNull(Uses::create(''));
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Uses::create('body');
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Uses::create('body', new FqsenResolver());
     }
 }

tests/unit/DocBlock/Tags/VarTest.php

@@ -174,30 +174,30 @@ class VarTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Var_::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
+        $this->expectException('InvalidArgumentException');
         $descriptionFactory = m::mock(DescriptionFactory::class);
         Var_::create('', new TypeResolver(), $descriptionFactory);
     }
 
     /**
      * @covers ::create
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfResolverIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Var_::create('body');
     }
 
     /**
      * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
-     * @expectedException \InvalidArgumentException
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {
+        $this->expectException('InvalidArgumentException');
         Var_::create('body', new TypeResolver());
     }
 }

tests/unit/DocBlockTest.php

@@ -84,18 +84,15 @@ class DocBlockTest extends TestCase
     /**
      * @covers ::__construct
      * @covers ::getTags
-     *
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tag
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testDocBlockAllowsOnlyTags() : void
     {
+        $this->expectException('InvalidArgumentException');
         $tags = [
             null
         ];
-
         $fixture = new DocBlock('', null, $tags);
     }