Merge pull request #821 from meyerbaptiste/various_fixes_after_static_analysis

Various fixes after static analysis

Author: dunglas

src/Api/ResourceClassResolver.php

@@ -49,7 +49,7 @@ public function getResourceClass($value, string $resourceClass = null, bool $str
             $typeToFind = $type = $resourceClass;
         }
 
-        if (!$this->isResourceClass($typeToFind) || ($strict && isset($type) && $resourceClass !== $type)) {
+        if (($strict && isset($type) && $resourceClass !== $type) || !$this->isResourceClass($typeToFind)) {
             if (is_subclass_of($type, $resourceClass) && $this->isResourceClass($resourceClass)) {
                 return $type;
             }

src/Bridge/Doctrine/Orm/CollectionDataProvider.php

@@ -42,6 +42,8 @@ public function __construct(ManagerRegistry $managerRegistry, array $collectionE
 
     /**
      * {@inheritdoc}
+     *
+     * @throws RuntimeException
      */
     public function getCollection(string $resourceClass, string $operationName = null)
     {

src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -116,7 +116,7 @@ private function joinRelations(QueryBuilder $queryBuilder, string $resourceClass
 
             $queryBuilder->addSelect(sprintf('partial %s.{%s}', $associationAlias, implode(',', $select)));
 
-            $relationAlias = $relationAlias.++$j;
+            $relationAlias .= ++$j;
 
             $this->joinRelations($queryBuilder, $mapping['targetEntity'], $propertyMetadataOptions, $associationAlias, $relationAlias, $method === 'leftJoin');
         }

src/Bridge/Doctrine/Orm/Extension/FilterExtension.php

@@ -47,7 +47,7 @@ public function applyToCollection(QueryBuilder $queryBuilder, QueryNameGenerator
         }
 
         foreach ($this->filters as $filterName => $filter) {
-            if (in_array($filterName, $resourceFilters) && $filter instanceof FilterInterface) {
+            if ($filter instanceof FilterInterface && in_array($filterName, $resourceFilters)) {
                 $filter->apply($queryBuilder, $queryNameGenerator, $resourceClass, $operationName);
             }
         }

src/Bridge/Doctrine/Orm/Filter/BooleanFilter.php

@@ -13,11 +13,8 @@
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\QueryBuilder;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Filters the collection by boolean values.
@@ -33,11 +30,6 @@
  */
 class BooleanFilter extends AbstractFilter
 {
-    public function __construct(ManagerRegistry $managerRegistry, RequestStack $requestStack, LoggerInterface $logger = null, array $properties = null)
-    {
-        parent::__construct($managerRegistry, $requestStack, $logger, $properties);
-    }
-
     /**
      * {@inheritdoc}
      */

src/Bridge/Doctrine/Orm/Filter/DateFilter.php

@@ -12,10 +12,7 @@
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Filter;
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\QueryBuilder;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Filters the collection by date intervals.
@@ -37,11 +34,6 @@ class DateFilter extends AbstractFilter
         'time' => true,
     ];
 
-    public function __construct(ManagerRegistry $managerRegistry, RequestStack $requestStack, LoggerInterface $logger = null, array $properties = null)
-    {
-        parent::__construct($managerRegistry, $requestStack, $logger, $properties);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -88,7 +80,7 @@ protected function filterProperty(string $property, $values, QueryBuilder $query
             list($alias, $field) = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator);
         }
 
-        $nullManagement = isset($this->properties[$property]) ? $this->properties[$property] : null;
+        $nullManagement = $this->properties[$property] ?? null;
 
         if (self::EXCLUDE_NULL === $nullManagement) {
             $queryBuilder->andWhere($queryBuilder->expr()->isNotNull(sprintf('%s.%s', $alias, $field)));

src/Bridge/Doctrine/Orm/Filter/NumericFilter.php

@@ -13,11 +13,8 @@
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\QueryBuilder;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Filters the collection by numeric values.
@@ -45,11 +42,6 @@ class NumericFilter extends AbstractFilter
         DBALType::SMALLINT => true,
     ];
 
-    public function __construct(ManagerRegistry $managerRegistry, RequestStack $requestStack, LoggerInterface $logger = null, array $properties = null)
-    {
-        parent::__construct($managerRegistry, $requestStack, $logger, $properties);
-    }
-
     /**
      * {@inheritdoc}
      */

src/Bridge/Doctrine/Orm/Filter/RangeFilter.php

@@ -13,10 +13,7 @@
 
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\QueryBuilder;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Filters the collection by range.
@@ -31,11 +28,6 @@ class RangeFilter extends AbstractFilter
     const PARAMETER_LESS_THAN = 'lt';
     const PARAMETER_LESS_THAN_OR_EQUAL = 'lte';
 
-    public function __construct(ManagerRegistry $managerRegistry, RequestStack $requestStack, LoggerInterface $logger = null, array $properties = null)
-    {
-        parent::__construct($managerRegistry, $requestStack, $logger, $properties);
-    }
-
     /**
      * {@inheritdoc}
      */

src/Bridge/Doctrine/Orm/Filter/SearchFilter.php

@@ -168,9 +168,9 @@ private function getType(string $doctrineType) : string
     protected function filterProperty(string $property, $value, QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass, string $operationName = null)
     {
         if (
+            null === $value ||
             !$this->isPropertyEnabled($property) ||
-            !$this->isPropertyMapped($property, $resourceClass, true) ||
-            null === $value
+            !$this->isPropertyMapped($property, $resourceClass, true)
         ) {
             return;
         }

src/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -17,6 +17,7 @@
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use ApiPlatform\Core\Exception\ResourceClassNotSupportedException;
+use ApiPlatform\Core\Exception\RuntimeException;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use Doctrine\Common\Persistence\ManagerRegistry;
@@ -53,6 +54,8 @@ public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollec
 
     /**
      * {@inheritdoc}
+     *
+     * @throws RuntimeException
      */
     public function getItem(string $resourceClass, $id, string $operationName = null, bool $fetchData = false)
     {
@@ -68,6 +71,10 @@ public function getItem(string $resourceClass, $id, string $operationName = null
         }
 
         $repository = $manager->getRepository($resourceClass);
+        if (!method_exists($repository, 'createQueryBuilder')) {
+            throw new RuntimeException('The repository class must have a "createQueryBuilder" method.');
+        }
+
         $queryBuilder = $repository->createQueryBuilder('o');
         $queryNameGenerator = new QueryNameGenerator();