Add PHPStan check

.github/workflows/qa.yml

@@ -0,0 +1,12 @@
+on: [push, pull_request]
+name: Quality assurance
+jobs:
+    phpstan:
+        name: PHPStan
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: PHPStan
+              uses: "docker://oskarstark/phpstan-ga"
+              with:
+                  args: analyse

phpstan.neon.dist

@@ -0,0 +1,30 @@
+parameters:
+    level: 1
+
+    paths:
+        - src
+# Uncomment this, when phpstan extensions are allowed
+#        - tests
+
+    excludes_analyse:
+        - src/Test/AbstractWidgetTestCase.php
+        - tests/bootstrap.php
+
+    autoload_files:
+        - vendor/autoload.php
+
+    ignoreErrors:
+            -
+                message: "#^Instantiated class MongoId not found\\.$#"
+                count: 1
+                path: src/Filter/ModelFilter.php
+
+            -
+                message: "#^Caught class MongoException not found\\.$#"
+                count: 1
+                path: src/Filter/ModelFilter.php
+
+            -
+                message: "#^Instantiated class MongoRegex not found\\.$#"
+                count: 1
+                path: src/Filter/StringFilter.php

src/Admin/FieldDescription.php

@@ -86,7 +86,7 @@ public function setParentAssociationMappings(array $parentAssociationMappings)
      */
     public function isIdentifier()
     {
-        return isset($this->fieldMapping['id']) ? $this->fieldMapping['id'] : false;
+        return $this->fieldMapping['id'] ?? false;
     }
 
     /**

src/Builder/DatagridBuilder.php

@@ -57,7 +57,7 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
         $fieldDescription->setAdmin($admin);
 
         if ($admin->getModelManager()->hasMetadata($admin->getClass())) {
-            list($metadata, $lastPropertyName, $parentAssociationMappings) = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
+            [$metadata, $lastPropertyName, $parentAssociationMappings] = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
 
             // set the default field mapping
             if (isset($metadata->fieldMappings[$lastPropertyName])) {

src/Builder/ListBuilder.php

@@ -78,7 +78,7 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
         $fieldDescription->setAdmin($admin);
 
         if ($admin->getModelManager()->hasMetadata($admin->getClass())) {
-            list($metadata, $lastPropertyName, $parentAssociationMappings) = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
+            [$metadata, $lastPropertyName, $parentAssociationMappings] = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
             $fieldDescription->setParentAssociationMappings($parentAssociationMappings);
 
             // set the default field mapping

src/Builder/ShowBuilder.php

@@ -68,7 +68,7 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
         $fieldDescription->setAdmin($admin);
 
         if ($admin->getModelManager()->hasMetadata($admin->getClass())) {
-            list($metadata, $lastPropertyName, $parentAssociationMappings) = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
+            [$metadata, $lastPropertyName, $parentAssociationMappings] = $admin->getModelManager()->getParentMetadataForProperty($admin->getClass(), $fieldDescription->getName());
             $fieldDescription->setParentAssociationMappings($parentAssociationMappings);
 
             // set the default field mapping

src/Datagrid/Pager.php

@@ -47,14 +47,6 @@ public function getResults()
         return $this->getQuery()->execute();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
     /**
      * {@inheritdoc}
      */

src/Datagrid/ProxyQuery.php

@@ -56,7 +56,7 @@ public function execute(array $params = [], $hydrationMode = null)
             $queryBuilder->sort($sortBy, $this->getSortOrder());
         }
 
-        return $queryBuilder->getQuery()->execute($params, $hydrationMode);
+        return $queryBuilder->getQuery()->execute();
     }
 
     public function setSortBy($parentAssociationMappings, $fieldMapping)

src/DependencyInjection/SonataDoctrineMongoDBAdminExtension.php

@@ -42,8 +42,6 @@ public function load(array $configs, ContainerBuilder $container)
         $processor = new Processor();
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $pool = $container->getDefinition('sonata.admin.manager.doctrine_mongodb');
-
         $container->setParameter('sonata_doctrine_mongodb_admin.templates', $config['templates']);
 
         // define the templates

src/Filter/AbstractDateFilter.php

@@ -49,34 +49,44 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
         $data['type'] = !isset($data['type']) || !is_numeric($data['type']) ? DateType::TYPE_EQUAL : $data['type'];
 
         // Some types do not require a value to be set (NULL, NOT NULL).
-        if (!$this->typeRequiresValue($data['type']) && !$data['value']) {
+        if (!($data['value'] ?? false) && !$this->typeRequiresValue($data['type'])) {
             return;
         }
 
         switch ($data['type']) {
             case DateType::TYPE_EQUAL:
+                $this->active = true;
+
                 return $this->applyTypeIsEqual($queryBuilder, $field, $data);
 
             case DateType::TYPE_GREATER_THAN:
                 if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 
+                $this->active = true;
+
                 return $this->applyTypeIsGreaterThan($queryBuilder, $field, $data);
 
             case DateType::TYPE_LESS_EQUAL:
                 if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 
+                $this->active = true;
+
                 return $this->applyTypeIsLessEqual($queryBuilder, $field, $data);
 
             case DateType::TYPE_NULL:
             case DateType::TYPE_NOT_NULL:
+                $this->active = true;
+
                 return $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, null);
 
             case DateType::TYPE_GREATER_EQUAL:
             case DateType::TYPE_LESS_THAN:
+                $this->active = true;
+
                 return $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, $data['value']);
         }
     }
@@ -111,6 +121,30 @@ public function getRenderSettings()
         ]];
     }
 
+    /**
+     * @param string $field
+     * @param array  $data
+     */
+    protected function applyTypeIsLessEqual(ProxyQueryInterface $queryBuilder, $field, $data)
+    {
+    }
+
+    /**
+     * @param string $field
+     * @param array  $data
+     */
+    protected function applyTypeIsGreaterThan(ProxyQueryInterface $queryBuilder, $field, $data)
+    {
+    }
+
+    /**
+     * @param string $field
+     * @param array  $data
+     */
+    protected function applyTypeIsEqual(ProxyQueryInterface $queryBuilder, $field, $data)
+    {
+    }
+
     /**
      * @param string    $operation
      * @param string    $field

src/Filter/BooleanFilter.php

@@ -38,7 +38,7 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
                     continue;
                 }
 
-                $values[] = (BooleanType::TYPE_YES === $v) ? true : false;
+                $values[] = BooleanType::TYPE_YES === $v;
             }
 
             if (0 === \count($values)) {
@@ -52,7 +52,7 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
                 return;
             }
 
-            $value = BooleanType::TYPE_YES === $data['value'] ? true : false;
+            $value = BooleanType::TYPE_YES === $data['value'];
 
             $queryBuilder->field($field)->equals($value);
             $this->active = true;

src/Filter/DateFilter.php

@@ -14,9 +14,15 @@
 namespace Sonata\DoctrineMongoDBAdminBundle\Filter;
 
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 
 class DateFilter extends AbstractDateFilter
 {
+    public function getFieldType()
+    {
+        return $this->getOption('field_type', DateType::class);
+    }
+
     /**
      * @param string $field
      * @param array  $data

src/Filter/DateTimeFilter.php

@@ -14,6 +14,7 @@
 namespace Sonata\DoctrineMongoDBAdminBundle\Filter;
 
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 
 class DateTimeFilter extends AbstractDateFilter
 {
@@ -24,6 +25,11 @@ class DateTimeFilter extends AbstractDateFilter
      */
     protected $time = true;
 
+    public function getFieldType()
+    {
+        return $this->getOption('field_type', DateTimeType::class);
+    }
+
     /**
      * @param string $field
      * @param array  $data

src/Guesser/FilterTypeGuesser.php

@@ -50,7 +50,7 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
             'options' => [],
         ];
 
-        list($metadata, $propertyName, $parentAssociationMappings) = $ret;
+        [$metadata, $propertyName, $parentAssociationMappings] = $ret;
 
         $options['parent_association_mappings'] = $parentAssociationMappings;
 

src/Guesser/TypeGuesser.php

@@ -30,7 +30,7 @@ public function guessType($class, $property, ModelManagerInterface $modelManager
             return new TypeGuess('text', [], Guess::LOW_CONFIDENCE);
         }
 
-        list($metadata, $propertyName, $parentAssociationMappings) = $ret;
+        [$metadata, $propertyName,] = $ret;
 
         if ($metadata->hasAssociation($propertyName)) {
             $mapping = $metadata->fieldMappings[$propertyName];

src/Model/ModelManager.php

@@ -14,6 +14,7 @@
 namespace Sonata\DoctrineMongoDBAdminBundle\Model;
 
 use Doctrine\ODM\MongoDB\Query\Builder;
+use Doctrine\ODM\MongoDB\Query\Query;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 use Sonata\AdminBundle\Datagrid\DatagridInterface;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
@@ -22,7 +23,6 @@
 use Sonata\DoctrineMongoDBAdminBundle\Datagrid\ProxyQuery;
 use Sonata\Exporter\Source\DoctrineODMQuerySourceIterator;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
-use Symfony\Component\Form\Exception\PropertyAccessDeniedException;
 
 class ModelManager implements ModelManagerInterface
 {
@@ -97,7 +97,7 @@ public function getNewFieldDescriptionInstance($class, $name, array $options = [
             $options['route']['parameters'] = [];
         }
 
-        list($metadata, $propertyName, $parentAssociationMappings) = $this->getParentMetadataForProperty($class, $name);
+        [$metadata, $propertyName, $parentAssociationMappings] = $this->getParentMetadataForProperty($class, $name);
 
         $fieldDescription = new FieldDescription();
         $fieldDescription->setName($name);
@@ -359,6 +359,17 @@ public function getExportFields($class)
      */
     public function getModelInstance($class)
     {
+        $r = new \ReflectionClass($class);
+        if ($r->isAbstract()) {
+            throw new \InvalidArgumentException(sprintf('Cannot initialize abstract class: %s', $class));
+        }
+
+        $constructor = $r->getConstructor();
+
+        if (null !== $constructor && (!$constructor->isPublic() || $constructor->getNumberOfRequiredParameters() > 0)) {
+            return $r->newInstanceWithoutConstructor();
+        }
+
         return new $class();
     }
 
@@ -443,7 +454,7 @@ public function modelReverseTransform($class, array $array = [])
 
             if ($reflClass->hasMethod($setter)) {
                 if (!$reflClass->getMethod($setter)->isPublic()) {
-                    throw new PropertyAccessDeniedException(sprintf('Method "%s()" is not public in class "%s"', $setter, $reflClass->getName()));
+                    throw new \BadMethodCallException(sprintf('Method "%s()" is not public in class "%s"', $setter, $reflClass->getName()));
                 }
 
                 $instance->$setter($value);
@@ -452,7 +463,7 @@ public function modelReverseTransform($class, array $array = [])
                 $instance->$property = $value;
             } elseif ($reflClass->hasProperty($property)) {
                 if (!$reflClass->getProperty($property)->isPublic()) {
-                    throw new PropertyAccessDeniedException(sprintf('Property "%s" is not public in class "%s". Maybe you should create the method "set%s()"?', $property, $reflClass->getName(), ucfirst($property)));
+                    throw new \BadMethodCallException(sprintf('Property "%s" is not public in class "%s". Maybe you should create the method "set%s()"?', $property, $reflClass->getName(), ucfirst($property)));
                 }
 
                 $instance->$property = $value;
@@ -505,14 +516,14 @@ public function collectionRemoveElement(&$collection, &$element)
     }
 
     /**
-     * method taken from PropertyPath.
+     * method taken from Symfony\Component\PropertyAccess\PropertyAccessor.
      *
      * @param string $property
      *
      * @return mixed
      */
     protected function camelize($property)
     {
-        return preg_replace(['/(^|_)+(.)/e', '/\.(.)/e'], ["strtoupper('\\2')", "'_'.strtoupper('\\1')"], $property);
+        return str_replace(' ', '', ucwords(str_replace('_', ' ', $property)));
     }
 }

src/Util/ObjectAclManipulator.php

@@ -51,6 +51,7 @@ public function batchConfigureAcls(OutputInterface $output, AdminInterface $admi
             $batchSize = 20;
             $batchSizeOutput = 200;
             $objectIds = [];
+            $objectIdIterator = new \ArrayIterator();
 
             foreach ($qb->getQuery()->iterate() as $row) {
                 $objectIds[] = ObjectIdentity::fromDomainObject($row);
@@ -62,7 +63,7 @@ public function batchConfigureAcls(OutputInterface $output, AdminInterface $admi
                 ++$count;
 
                 if (0 === ($count % $batchSize)) {
-                    list($batchAdded, $batchUpdated) = $this->configureAcls($output, $admin, $objectIdIterator, $securityIdentity);
+                    [$batchAdded, $batchUpdated] = $this->configureAcls($output, $admin, $objectIdIterator, $securityIdentity);
                     $countAdded += $batchAdded;
                     $countUpdated += $batchUpdated;
                     $objectIds = [];
@@ -80,7 +81,7 @@ public function batchConfigureAcls(OutputInterface $output, AdminInterface $admi
             }
 
             if (\count($objectIds) > 0) {
-                list($batchAdded, $batchUpdated) = $this->configureAcls($output, $admin, $objectIdIterator, $securityIdentity);
+                [$batchAdded, $batchUpdated] = $this->configureAcls($output, $admin, $objectIdIterator, $securityIdentity);
                 $countAdded += $batchAdded;
                 $countUpdated += $batchUpdated;
             }