Merge pull request #2267 from antograssiot/phpstan

Bump PHPStan version

Author: dunglas

.circleci/config.yml

@@ -110,7 +110,7 @@ jobs:
       - *update-project-dependencies
       - run:
           name: Install PHPStan
-          command: composer global require phpstan/phpstan:0.10.1
+          command: composer global require phpstan/phpstan:0.10.5
       - *save-composer-cache-by-revision
       - *save-composer-cache-by-branch
       - run:

appveyor.yml

@@ -19,7 +19,7 @@ install:
   - echo extension=php_pdo_sqlite.dll >> php.ini
   - echo memory_limit=3G >> php.ini
   - cd %APPVEYOR_BUILD_FOLDER%
-  - composer install --no-interaction --no-progress
+  - composer install --no-interaction --no-progress --no-suggest
 
 test_script:
   - cd %APPVEYOR_BUILD_FOLDER%

features/security/README.md

@@ -60,7 +60,7 @@ one of the most popular framework validation in the world.
 
 The sending of security headers is ensured by [our "send security headers" functional test suite](send_security_headers.feature)
 and the unit tests of the [`RespondListener`](../../tests/EventListener/RespondListenerTest.php), [`ExceptionAction`](../../tests/Action/ExceptionActionTest.php)
-and [`ValidationExceptionListener`](../../tests/Bridge/Symfony/Validation/EventListener/ValidationExceptionListenerTest.php).
+and [`ValidationExceptionListener`](../../tests/Bridge/Symfony/Validator/EventListener/ValidationExceptionListenerTest.php).
 
 ### JSON encoding
 

src/Bridge/Doctrine/Orm/Util/QueryJoinParser.php

@@ -100,35 +100,15 @@ public static function getClassMetadataFromJoinAlias(string $alias, QueryBuilder
      */
     public static function getJoinRelationship(Join $join): string
     {
-        static $relationshipProperty = null;
-        static $initialized = false;
-
-        if (!$initialized && !method_exists(Join::class, 'getJoin')) {
-            $relationshipProperty = new \ReflectionProperty(Join::class, '_join');
-            $relationshipProperty->setAccessible(true);
-
-            $initialized = true;
-        }
-
-        return (null === $relationshipProperty) ? $join->getJoin() : $relationshipProperty->getValue($join);
+        return $join->getJoin();
     }
 
     /**
      * Gets the alias from a Join expression.
      */
     public static function getJoinAlias(Join $join): string
     {
-        static $aliasProperty = null;
-        static $initialized = false;
-
-        if (!$initialized && !method_exists(Join::class, 'getAlias')) {
-            $aliasProperty = new \ReflectionProperty(Join::class, '_alias');
-            $aliasProperty->setAccessible(true);
-
-            $initialized = true;
-        }
-
-        return (null === $aliasProperty) ? $join->getAlias() : $aliasProperty->getValue($join);
+        return $join->getAlias();
     }
 
     /**
@@ -139,16 +119,6 @@ public static function getJoinAlias(Join $join): string
      */
     public static function getOrderByParts(OrderBy $orderBy): array
     {
-        static $partsProperty = null;
-        static $initialized = false;
-
-        if (!$initialized && !method_exists(OrderBy::class, 'getParts')) {
-            $partsProperty = new \ReflectionProperty(OrderBy::class, '_parts');
-            $partsProperty->setAccessible(true);
-
-            $initialized = true;
-        }
-
-        return (null === $partsProperty) ? $orderBy->getParts() : $partsProperty->getValue($orderBy);
+        return $orderBy->getParts();
     }
 }

src/DataProvider/SubresourceDataProviderInterface.php

@@ -32,7 +32,7 @@ interface SubresourceDataProviderInterface
      *
      * @throws ResourceClassNotSupportedException
      *
-     * @return object|null
+     * @return array|object|null
      */
     public function getSubresource(string $resourceClass, array $identifiers, array $context, string $operationName = null);
 }

src/GraphQl/Type/Definition/IterableType.php

@@ -20,6 +20,7 @@
 use GraphQL\Language\AST\ListValueNode;
 use GraphQL\Language\AST\ObjectValueNode;
 use GraphQL\Language\AST\StringValueNode;
+use GraphQL\Language\AST\ValueNode;
 use GraphQL\Type\Definition\ScalarType;
 use GraphQL\Utils\Utils;
 
@@ -80,7 +81,7 @@ public function parseLiteral($valueNode, array $variables = null)
     }
 
     /**
-     * @param StringValueNode|BooleanValueNode|IntValueNode|FloatValueNode|ObjectValueNode|ListValueNode $valueNode
+     * @param StringValueNode|BooleanValueNode|IntValueNode|FloatValueNode|ObjectValueNode|ListValueNode|ValueNode $valueNode
      */
     private function parseIterableLiteral($valueNode)
     {

src/Swagger/Serializer/DocumentationNormalizer.php

@@ -263,10 +263,7 @@ private function updateGetOperation(\ArrayObject $pathOperation, array $mimeType
                     ],
                 ],
             ];
-
-            if (!isset($pathOperation['parameters']) && $parameters = $this->getFiltersParameters($resourceClass, $operationName, $resourceMetadata, $definitions, $serializerContext)) {
-                $pathOperation['parameters'] = $parameters;
-            }
+            $pathOperation['parameters'] ?? $pathOperation['parameters'] = $this->getFiltersParameters($resourceClass, $operationName, $resourceMetadata, $definitions, $serializerContext);
 
             if ($this->paginationEnabled && $resourceMetadata->getCollectionOperationAttribute($operationName, 'pagination_enabled', true, true)) {
                 $pathOperation['parameters'][] = $this->getPaginationParameters();

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

@@ -55,14 +55,6 @@ public function testGetJoinRelationshipWithClassJoin()
         $this->assertEquals(RelatedDummy::class, QueryJoinParser::getJoinRelationship($join));
     }
 
-    public function testGetJoinRelationshipWithReflection()
-    {
-        $methodExist = $this->getFunctionMock('ApiPlatform\Core\Bridge\Doctrine\Orm\Util', 'method_exists');
-        $methodExist->expects($this->any())->with(Join::class, 'getJoin')->willReturn('false');
-        $join = new Join('INNER_JOIN', 'a_1.relatedDummy', 'a_1', null, 'a_1.name = r.name');
-        $this->assertEquals('a_1.relatedDummy', QueryJoinParser::getJoinRelationship($join));
-    }
-
     public function testGetJoinAliasWithJoin()
     {
         $join = new Join('INNER_JOIN', 'relatedDummy', 'a_1', null, 'a_1.name = r.name');
@@ -75,25 +67,9 @@ public function testGetJoinAliasWithClassJoin()
         $this->assertEquals('a_1', QueryJoinParser::getJoinAlias($join));
     }
 
-    public function testGetJoinAliasWithReflection()
-    {
-        $methodExist = $this->getFunctionMock('ApiPlatform\Core\Bridge\Doctrine\Orm\Util', 'method_exists');
-        $methodExist->expects($this->any())->with(Join::class, 'getAlias')->willReturn('false');
-        $join = new Join('INNER_JOIN', 'relatedDummy', 'a_1', null, 'a_1.name = r.name');
-        $this->assertEquals('a_1', QueryJoinParser::getJoinAlias($join));
-    }
-
     public function testGetOrderByPartsWithOrderBy()
     {
         $orderBy = new OrderBy('name', 'asc');
         $this->assertEquals(['name asc'], QueryJoinParser::getOrderByParts($orderBy));
     }
-
-    public function testGetOrderByPartsWithReflection()
-    {
-        $methodExist = $this->getFunctionMock('ApiPlatform\Core\Bridge\Doctrine\Orm\Util', 'method_exists');
-        $methodExist->expects($this->any())->with(OrderBy::class, 'getParts')->willReturn('false');
-        $orderBy = new OrderBy('name', 'desc');
-        $this->assertEquals(['name desc'], QueryJoinParser::getOrderByParts($orderBy));
-    }
 }

tests/Metadata/Property/Factory/InheritedPropertyNameCollectionFactoryTest.php

@@ -34,7 +34,7 @@ public function testCreate()
 
         $propertyNameCollectionFactory = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
         $propertyNameCollectionFactory->create(DummyTableInheritance::class, [])->willReturn(new PropertyNameCollection(['name']))->shouldBeCalled();
-        $propertyNameCollectionFactory->create(DummyTableInheritanceChild::class, [])->willReturn(new PropertyNameCollection(['nickname', 169]))->shouldBeCalled();
+        $propertyNameCollectionFactory->create(DummyTableInheritanceChild::class, [])->willReturn(new PropertyNameCollection(['nickname', '169']))->shouldBeCalled();
 
         $factory = new InheritedPropertyNameCollectionFactory($resourceNameCollectionFactory->reveal(), $propertyNameCollectionFactory->reveal());
         $metadata = $factory->create(DummyTableInheritance::class);