diff --git a/src/Api/CachedIdentifiersExtractor.php b/src/Api/CachedIdentifiersExtractor.php
index 2110fa33ee3..f053d977491 100644
--- a/src/Api/CachedIdentifiersExtractor.php
+++ b/src/Api/CachedIdentifiersExtractor.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the API Platform project.
  *
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Util\ClassInfoTrait;
diff --git a/src/Api/IdentifiersExtractor.php b/src/Api/IdentifiersExtractor.php
index d81166d1084..99afdff1f9a 100644
--- a/src/Api/IdentifiersExtractor.php
+++ b/src/Api/IdentifiersExtractor.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the API Platform project.
  *
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 use ApiPlatform\Core\Exception\RuntimeException;
diff --git a/src/Api/IdentifiersExtractorInterface.php b/src/Api/IdentifiersExtractorInterface.php
index 4d0eb6b1589..7a07e2f0b1a 100644
--- a/src/Api/IdentifiersExtractorInterface.php
+++ b/src/Api/IdentifiersExtractorInterface.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the API Platform project.
  *
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 /**
diff --git a/src/Api/OperationType.php b/src/Api/OperationType.php
index 32e58a5f8a5..65267b54f55 100644
--- a/src/Api/OperationType.php
+++ b/src/Api/OperationType.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 final class OperationType
diff --git a/src/Api/OperationTypeDeprecationHelper.php b/src/Api/OperationTypeDeprecationHelper.php
index ccd13cd61a1..0fad8642d7e 100644
--- a/src/Api/OperationTypeDeprecationHelper.php
+++ b/src/Api/OperationTypeDeprecationHelper.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Api;
 
 /**
diff --git a/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php b/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php
index 19594b3978c..50b95d0f69b 100644
--- a/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php
+++ b/src/Bridge/Doctrine/Orm/SubresourceDataProvider.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface;
diff --git a/src/DataProvider/ChainSubresourceDataProvider.php b/src/DataProvider/ChainSubresourceDataProvider.php
index f3af72eb6d9..c2e30006d6e 100644
--- a/src/DataProvider/ChainSubresourceDataProvider.php
+++ b/src/DataProvider/ChainSubresourceDataProvider.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\DataProvider;
 
 use ApiPlatform\Core\Exception\ResourceClassNotSupportedException;
diff --git a/src/DataProvider/SubresourceDataProviderInterface.php b/src/DataProvider/SubresourceDataProviderInterface.php
index 1b89fcbe9e4..a0585f7aaa3 100644
--- a/src/DataProvider/SubresourceDataProviderInterface.php
+++ b/src/DataProvider/SubresourceDataProviderInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\DataProvider;
 
 use ApiPlatform\Core\Exception\ResourceClassNotSupportedException;
diff --git a/tests/Api/CachedIdentifiersExtractorTest.php b/tests/Api/CachedIdentifiersExtractorTest.php
index 0b69ba50002..78dc2e0aa6f 100644
--- a/tests/Api/CachedIdentifiersExtractorTest.php
+++ b/tests/Api/CachedIdentifiersExtractorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the API Platform project.
  *
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Api;
 
 use ApiPlatform\Core\Api\CachedIdentifiersExtractor;
diff --git a/tests/Api/IdentifiersExtractorTest.php b/tests/Api/IdentifiersExtractorTest.php
index d07c3ec7201..d99b3082afa 100644
--- a/tests/Api/IdentifiersExtractorTest.php
+++ b/tests/Api/IdentifiersExtractorTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the API Platform project.
  *
@@ -11,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Api;
 
 use ApiPlatform\Core\Api\IdentifiersExtractor;
diff --git a/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php b/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php
index 4313b45a01c..f0f9dbab04a 100644
--- a/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php
+++ b/tests/Bridge/Doctrine/Orm/SubresourceDataProviderTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Bridge\Doctrine\Orm;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultCollectionExtensionInterface;
diff --git a/tests/DataProvider/ChainSubresourcedataProviderTest.php b/tests/DataProvider/ChainSubresourcedataProviderTest.php
index 3746e987a4c..08b32ce81ee 100644
--- a/tests/DataProvider/ChainSubresourcedataProviderTest.php
+++ b/tests/DataProvider/ChainSubresourcedataProviderTest.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\DataProvider;
 
 use ApiPlatform\Core\DataProvider\ChainSubresourceDataProvider;
diff --git a/tests/Fixtures/TestBundle/Entity/Answer.php b/tests/Fixtures/TestBundle/Entity/Answer.php
index ec592613a2b..f850310bc74 100644
--- a/tests/Fixtures/TestBundle/Entity/Answer.php
+++ b/tests/Fixtures/TestBundle/Entity/Answer.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
@@ -19,7 +20,6 @@
 /**
  * Answer.
  *
- * @ORM\Table(name="answer")
  * @ORM\Entity
  * @ApiResource(collectionOperations={
  *     "get_subresource_answer"={"method"="GET", "normalization_context"={"groups"={"foobar"}}}
@@ -28,7 +28,7 @@
 class Answer
 {
     /**
-     * @ORM\Column(name="id", type="integer")
+     * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Serializer\Groups({"foobar"})
@@ -36,7 +36,7 @@ class Answer
     private $id;
 
     /**
-     * @ORM\Column(name="content", type="string", nullable=false)
+     * @ORM\Column(nullable=false)
      * @Serializer\Groups({"foobar"})
      */
     private $content;
diff --git a/tests/Fixtures/TestBundle/Entity/Container.php b/tests/Fixtures/TestBundle/Entity/Container.php
index 8c1ec2e2cf1..f64b24ef030 100644
--- a/tests/Fixtures/TestBundle/Entity/Container.php
+++ b/tests/Fixtures/TestBundle/Entity/Container.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
@@ -25,7 +26,7 @@ class Container
 {
     /**
      * @ORM\Id
-     * @ORM\Column(name="id", type="guid")
+     * @ORM\Column(type="guid")
      *
      * @var string UUID
      */
@@ -47,17 +48,11 @@ class Container
      */
     private $nodes;
 
-    /**
-     * @return string
-     */
     public function getId(): string
     {
         return $this->id;
     }
 
-    /**
-     * @param string id
-     */
     public function setId(string $id)
     {
         $this->id = $id;
diff --git a/tests/Fixtures/TestBundle/Entity/Node.php b/tests/Fixtures/TestBundle/Entity/Node.php
index 935d97510ba..468c60407d8 100644
--- a/tests/Fixtures/TestBundle/Entity/Node.php
+++ b/tests/Fixtures/TestBundle/Entity/Node.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiResource;
diff --git a/tests/Fixtures/TestBundle/Entity/Question.php b/tests/Fixtures/TestBundle/Entity/Question.php
index 5685aad2eb9..4f93749a000 100644
--- a/tests/Fixtures/TestBundle/Entity/Question.php
+++ b/tests/Fixtures/TestBundle/Entity/Question.php
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=1);
 /*
  * This file is part of the API Platform project.
  *
@@ -10,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Core\Annotation\ApiProperty;
@@ -17,21 +18,20 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Table(name="question")
  * @ORM\Entity
  * @ApiResource
  */
 class Question
 {
     /**
-     * @ORM\Column(name="id", type="integer")
+     * @ORM\Column(type="integer")
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
      */
     private $id;
 
     /**
-     * @ORM\Column(name="content", type="string", nullable=true)
+     * @ORM\Column(nullable=true)
      */
     private $content;