Style fixes

Author: abluchet

tests/Annotation/ApiResourceTest.php

@@ -14,6 +14,7 @@
 namespace ApiPlatform\Core\Tests\Annotation;
 
 use ApiPlatform\Core\Annotation\ApiResource;
+use ApiPlatform\Core\Exception\InvalidArgumentException;
 use ApiPlatform\Core\Tests\Fixtures\AnnotatedClass;
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
@@ -102,12 +103,11 @@ public function testApiResourceAnnotation()
         ], $resource->attributes);
     }
 
-    /**
-     * @expectedException \ApiPlatform\Core\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Unknown property "invalidAttribute" on annotation "ApiPlatform\Core\Annotation\ApiResource".
-     */
     public function testConstructWithInvalidAttribute()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Unknown property "invalidAttribute" on annotation "ApiPlatform\\Core\\Annotation\\ApiResource".');
+
         new ApiResource([
             'shortName' => 'shortName',
             'routePrefix' => '/foo',

tests/Bridge/Doctrine/Orm/ItemDataProviderTest.php

@@ -17,9 +17,9 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultItemExtensionInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\ItemDataProvider;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use ApiPlatform\Core\Exception\RuntimeException;
+use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;

tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php

@@ -16,9 +16,9 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\SubresourceDataProvider;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Exception\ResourceClassNotSupportedException;
 use ApiPlatform\Core\Exception\RuntimeException;
+use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;

tests/Bridge/Doctrine/Orm/Util/IdentifierManagerTraitTest.php

@@ -93,7 +93,7 @@ public function testCompositeIdentifier()
     public function testInvalidIdentifier()
     {
         $this->expectException(PropertyNotFoundException::class);
-        $this->expectExceptionMessage('Invalid identifier "idbad=1;idb=2", "ida" has not been found.');
+        $this->expectExceptionMessage('Invalid identifier "idbad=1;idb=2", "ida" was not found.');
 
         list($propertyNameCollectionFactory, $propertyMetadataFactory) = $this->getMetadataFactories(Dummy::class, [
             'ida',

tests/Bridge/RamseyUuid/Normalizer/UuidNormalizerTest.php

@@ -34,11 +34,10 @@ public function testNoSupportDenormalizeUuid()
         $this->assertFalse($normalizer->supportsDenormalization($uuid, ''));
     }
 
-    /**
-     * @expectedException \ApiPlatform\Core\Exception\InvalidIdentifierException
-     */
     public function testFailDenormalizeUuid()
     {
+        $this->expectException(\ApiPlatform\Core\Exception\InvalidIdentifierException::class);
+
         $uuid = 'notanuuid';
         $normalizer = new UuidNormalizer();
         $this->assertTrue($normalizer->supportsDenormalization($uuid, Uuid::class));

tests/Bridge/Symfony/Routing/IriConverterTest.php

@@ -21,10 +21,10 @@
 use ApiPlatform\Core\Bridge\Symfony\Routing\RouteNameResolverInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
-use ApiPlatform\Core\Exception\InvalidIdentifierException;
-use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
+use ApiPlatform\Core\Exception\InvalidIdentifierException;
 use ApiPlatform\Core\Exception\ItemNotFoundException;
+use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
@@ -280,7 +280,7 @@ public function testGetItemFromIriBadIdentifierException()
             'id' => 3,
         ])->shouldBeCalledTimes(1);
         $identifierDenormalizerProphecy = $this->prophesize(ChainIdentifierDenormalizer::class);
-        $identifierDenormalizerProphecy->denormalize('3', Dummy::class)->shouldBeCalled()->willThrow(new InvalidIdentifierException('fail'));
+        $identifierDenormalizerProphecy->denormalize('3', Dummy::class)->shouldBeCalled()->willThrow(new InvalidIdentifierException('Item not found for "/users/3".'));
         $converter = $this->getIriConverter($routerProphecy, $routeNameResolverProphecy, null, null, $identifierDenormalizerProphecy);
         $this->assertEquals($converter->getItemFromIri('/users/3', ['fetch_data' => true]), $item);
     }

tests/EventListener/ReadListenerTest.php

@@ -18,8 +18,8 @@
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
 use ApiPlatform\Core\EventListener\ReadListener;
 use ApiPlatform\Core\Exception\InvalidIdentifierException;
-use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use ApiPlatform\Core\Exception\RuntimeException;
+use ApiPlatform\Core\Identifier\Normalizer\ChainIdentifierDenormalizer;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Symfony\Component\HttpFoundation\Request;
@@ -292,11 +292,10 @@ public function testRetrieveItemNotFound()
         $listener->onKernelRequest($event->reveal());
     }
 
-    /**
-     * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
     public function testRetrieveBadItemNormalizedIdentifiers()
     {
+        $this->expectException(NotFoundHttpException::class);
+
         $identifierDenormalizer = $this->prophesize(ChainIdentifierDenormalizer::class);
         $identifierDenormalizer->denormalize('1', 'Foo')->shouldBeCalled()->willThrow(new InvalidIdentifierException());
 
@@ -314,11 +313,10 @@ public function testRetrieveBadItemNormalizedIdentifiers()
         $listener->onKernelRequest($event->reveal());
     }
 
-    /**
-     * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
     public function testRetrieveBadSubresourceNormalizedIdentifiers()
     {
+        $this->expectException(NotFoundHttpException::class);
+
         $identifierDenormalizer = $this->prophesize(ChainIdentifierDenormalizer::class);
         $identifierDenormalizer->denormalize(Argument::type('string'), Argument::type('string'))->shouldBeCalled()->willThrow(new InvalidIdentifierException());
 

tests/Identifier/Normalizer/DateTimeIdentifierNormalizerTest.php

@@ -21,11 +21,10 @@
  */
 class DateTimeIdentifierNormalizerTest extends TestCase
 {
-    /**
-     * @expectedException \ApiPlatform\Core\Exception\InvalidIdentifierException
-     */
     public function testDenormalize()
     {
+        $this->expectException(\ApiPlatform\Core\Exception\InvalidIdentifierException::class);
+
         $normalizer = new DateTimeIdentifierDenormalizer();
         $normalizer->denormalize('not valid', \DateTimeImmutable::class);
     }