fix: tests and CS

api-platform · Dec 17, 2020 · 46bbf6b · 46bbf6b
1 parent 48d78b7
commit 46bbf6b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 12 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -17,6 +17,7 @@ $finder = PhpCsFixer\Finder::create()
         'tests/Fixtures/app/var',
     ])
     ->notPath('src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php')
+    ->notPath('tests/Fixtures/TestBundle/Entity/DummyPhp8.php') // temporary
     ->append([
         'tests/Fixtures/app/console',
     ]);

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -46,12 +46,6 @@ parameters:
 			message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#'
 			paths:
 				- src/Bridge/Doctrine/Common/PropertyHelperTrait.php
-		-
-			message: '#Variable \$iri might not be defined\.#'
-			path: src/JsonApi/Serializer/ItemNormalizer.php
-		-
-			message: '#Variable \$positionPm might not be defined\.#'
-			path: src/Util/ClassInfoTrait.php
 		- '#Access to an undefined property Prophecy\\Prophecy\\ObjectProphecy<(\\?[a-zA-Z0-9_]+)+>::\$[a-zA-Z0-9_]+#'
 		-
 			message: '#Call to an undefined method Doctrine\\Persistence\\ObjectManager::getConnection\(\)#'

diff --git a/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php b/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaFormat.php
@@ -32,7 +32,7 @@ class PropertySchemaFormat implements PropertySchemaRestrictionMetadataInterface
     public function create(Constraint $constraint, PropertyMetadata $propertyMetadata): array
     {
         if ($constraint instanceof Email) {
-            return  ['format' => 'email'];
+            return ['format' => 'email'];
         }
 
         if ($constraint instanceof Uuid) {

diff --git a/src/GraphQl/Resolver/Stage/ReadStage.php b/src/GraphQl/Resolver/Stage/ReadStage.php
@@ -35,9 +35,9 @@
  */
 final class ReadStage implements ReadStageInterface
 {
+    use ArrayTrait;
     use ClassInfoTrait;
     use IdentifierTrait;
-    use ArrayTrait;
 
     private $resourceMetadataFactory;
     private $iriConverter;

diff --git a/src/Util/Inflector.php b/src/Util/Inflector.php
@@ -13,7 +13,6 @@
 
 namespace ApiPlatform\Core\Util;
 
-use ApiPlatform\Core\Exception\RuntimeException;
 use Doctrine\Common\Inflector\Inflector as LegacyInflector;
 use Doctrine\Inflector\Inflector as InflectorObject;
 use Doctrine\Inflector\InflectorFactory;

diff --git a/tests/Bridge/Symfony/Routing/IriConverterTest.php b/tests/Bridge/Symfony/Routing/IriConverterTest.php
@@ -43,8 +43,8 @@
  */
 class IriConverterTest extends TestCase
 {
-    use ProphecyTrait;
     use ExpectDeprecationTrait;
+    use ProphecyTrait;
 
     public function testGetItemFromIriNoRouteException()
     {

diff --git a/tests/OpenApi/Factory/OpenApiFactoryTest.php b/tests/OpenApi/Factory/OpenApiFactoryTest.php
@@ -182,7 +182,6 @@ public function testInvoke(): void
         $dummySchema->setDefinitions(new \ArrayObject([
             'type' => 'object',
             'description' => 'This is a dummy.',
-            'additionalProperties' => true,
             'properties' => [
                 'id' => new \ArrayObject([
                     'type' => 'integer',

diff --git a/tests/Swagger/Serializer/DocumentationNormalizerV2Test.php b/tests/Swagger/Serializer/DocumentationNormalizerV2Test.php
@@ -66,8 +66,8 @@
  */
 class DocumentationNormalizerV2Test extends TestCase
 {
-    use ProphecyTrait;
     use ExpectDeprecationTrait;
+    use ProphecyTrait;
 
     private const OPERATION_FORMATS = [
         'input_formats' => ['jsonld' => ['application/ld+json']],