4.1.0 (#705)

* 4.1.0

* Fix static analysis

Author: VincentLanglet

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.1.0](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/compare/4.0.1...4.1.0) - 2021-12-04
+### Added
+- [[#699](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/pull/699)] Added support for Symfony 6 ([@jordisala1991](https://github.com/jordisala1991))
+
 ## [4.0.1](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/compare/4.0.0...4.0.1) - 2021-10-01
 ### Fixed
 - [[#680](https://github.com/sonata-project/SonataDoctrineMongoDBAdminBundle/pull/680)] Fixed not forcing to set `field_name` in `DatagridMapper` fields with type defined ([@franmomu](https://github.com/franmomu))

src/Datagrid/ProxyQuery.php

@@ -68,8 +68,6 @@ public function __clone()
     }
 
     /**
-     * @psalm-suppress TooManyTemplateParams until release of doctrine/mongodb-odm 2.3
-     *
      * @return Iterator<object>
      */
     public function execute()

src/FieldDescription/FieldDescriptionFactory.php

@@ -49,7 +49,7 @@ public function create(string $class, string $name, array $options = []): FieldD
      * @phpstan-param class-string $baseClass
      *
      * @phpstan-return array{
-     *      ClassMetadata,
+     *      ClassMetadata<object>,
      *      string,
      *      mixed[]
      * }
@@ -72,7 +72,9 @@ private function getParentMetadataForProperty(string $baseClass, string $propert
     }
 
     /**
-     * @param class-string $class
+     * @phpstan-template T of object
+     * @phpstan-param class-string<T> $class
+     * @phpstan-return ClassMetadata<T>
      */
     private function getMetadata(string $class): ClassMetadata
     {

src/Model/ModelManager.php

@@ -71,25 +71,41 @@ public function delete(object $object): void
         $documentManager->flush();
     }
 
+    /**
+     * @param int|string $id
+     *
+     * @phpstan-param class-string<T> $class
+     * @phpstan-return T|null
+     */
     public function find(string $class, $id): ?object
     {
         $documentManager = $this->getDocumentManager($class);
 
         return $documentManager->getRepository($class)->find($id);
     }
 
+    /**
+     * @phpstan-param class-string<T> $class
+     * @phpstan-return array<T>
+     */
     public function findBy(string $class, array $criteria = []): array
     {
         return $this->getDocumentManager($class)->getRepository($class)->findBy($criteria);
     }
 
+    /**
+     * @phpstan-param class-string<T> $class
+     * @phpstan-return T|null
+     */
     public function findOneBy(string $class, array $criteria = []): ?object
     {
         return $this->getDocumentManager($class)->getRepository($class)->findOneBy($criteria);
     }
 
     /**
-     * @param object|string $class
+     * NEXT_MAJOR: Change visibility to private.
+     *
+     * @param object|class-string<T> $class
      *
      * @throw \RuntimeException
      */
@@ -122,9 +138,6 @@ public function supportsQuery(object $query): bool
         return $query instanceof ProxyQuery || $query instanceof Builder;
     }
 
-    /**
-     * @psalm-suppress TooManyTemplateParams until release of doctrine/mongodb-odm 2.3
-     */
     public function executeQuery(object $query)
     {
         if ($query instanceof Builder) {
@@ -231,6 +244,9 @@ public function reverseTransform(object $object, array $array = []): void
         }
     }
 
+    /**
+     * @param MongoDBClassMetadata<T> $metadata
+     */
     private function getFieldName(MongoDBClassMetadata $metadata, string $name): string
     {
         if (\array_key_exists($name, $metadata->fieldMappings)) {
@@ -244,6 +260,11 @@ private function getFieldName(MongoDBClassMetadata $metadata, string $name): str
         return $name;
     }
 
+    /**
+     * @param class-string<T> $class
+     *
+     * @return MongoDBClassMetadata<T>
+     */
     private function getMetadata(string $class): MongoDBClassMetadata
     {
         return $this->getDocumentManager($class)->getClassMetadata($class);

tests/App/AppKernel.php

@@ -30,7 +30,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 /**
  * @psalm-suppress PropertyNotSetInConstructor
@@ -79,11 +78,9 @@ public function getProjectDir(): string
     }
 
     /**
-     * TODO: Use RoutingConfigurator when dropping support of symfony < 5.1.
+     * TODO: Add typehint when dropping support of symfony < 5.1.
      *
-     * @param RoutingConfigurator|RouteCollectionBuilder $routes
-     *
-     * @psalm-suppress DeprecatedClass
+     * @param RoutingConfigurator $routes
      */
     protected function configureRoutes($routes): void
     {

tests/ClassMetadataAnnotationTrait.php

@@ -20,7 +20,9 @@
 trait ClassMetadataAnnotationTrait
 {
     /**
-     * @phpstan-param class-string $class
+     * @phpstan-template T of object
+     * @phpstan-param class-string<T> $class
+     * @phpstan-return ClassMetadata<T>
      */
     protected function getMetadataForDocumentWithAnnotations(string $class): ClassMetadata
     {