Merge 4.x into 5.x

sonata-project · Jan 9, 2023 · e7ca847 · e7ca847
2 parents b952739 + 81bfbcb
commit e7ca847
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 14 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -63,6 +63,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.1.*
                       variant: symfony/symfony:"6.1.*"
+                    - php-version: '8.1'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 6.2.*
+                      variant: symfony/symfony:"6.2.*"
 
         steps:
             - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.9.1](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.9.0...4.9.1) - 2022-12-29
+### Fixed
+- [[#1690](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1690)] ProxyQuery and ProxyQueryInterface are covariant ([@VincentLanglet](https://github.com/VincentLanglet))
+
+## [4.9.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.8.0...4.9.0) - 2022-12-01
+### Deprecated
+- [[#1703](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1703)] Passing a null offset to `AuditReader::findRevisionHistory` ([@VincentLanglet](https://github.com/VincentLanglet))
+
+### Fixed
+- [[#1700](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1700)] Fix batch delete for more than 20 entities. ([@jordisala1991](https://github.com/jordisala1991))
+
 ## [4.8.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.7.0...4.8.0) - 2022-09-28
 ### Fixed
 - [[#1695](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1695)] Fix batch delete on entities with json columns on PostgreSQL. ([@jordisala1991](https://github.com/jordisala1991))

diff --git a/composer.json b/composer.json
@@ -58,7 +58,7 @@
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^4.0",
-        "rector/rector": "^0.14",
+        "rector/rector": "^0.15",
         "sonata-project/block-bundle": "^4.2",
         "sonata-project/entity-audit-bundle": "^1.1",
         "symfony/browser-kit": "^4.4 || ^5.4 || ^6.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,11 +1,18 @@
+# DO NOT EDIT THIS FILE!
+#
+# It's auto-generated by sonata-project/dev-kit package.
+
 includes:
     - phpstan-baseline.neon
+    - vendor/phpstan/phpstan/conf/bleedingEdge.neon
 
 parameters:
     level: 8
     paths:
         - src
         - tests
+    scanFiles:
+        - vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php
     treatPhpDocTypesAsCertain: false
     checkGenericClassInNonGenericObjectType: true
     checkInternalClassCaseSensitivity: true

diff --git a/src/Datagrid/ProxyQuery.php b/src/Datagrid/ProxyQuery.php
@@ -75,7 +75,7 @@
  * @method QueryBuilder         resetDQLParts($parts = null)
  * @method QueryBuilder         resetDQLPart($part)
  *
- * @phpstan-template T of object
+ * @phpstan-template-covariant T of object
  * @phpstan-implements ProxyQueryInterface<T>
  */
 final class ProxyQuery implements ProxyQueryInterface

diff --git a/src/Datagrid/ProxyQueryInterface.php b/src/Datagrid/ProxyQueryInterface.php
@@ -18,7 +18,7 @@
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface as BaseProxyQueryInterface;
 
 /**
- * @phpstan-template T of object
+ * @phpstan-template-covariant T of object
  * @phpstan-extends BaseProxyQueryInterface<T>
  */
 interface ProxyQueryInterface extends BaseProxyQueryInterface

diff --git a/tests/Block/AuditBlockServiceTest.php b/tests/Block/AuditBlockServiceTest.php
@@ -29,7 +29,7 @@ final class AuditBlockServiceTest extends BlockServiceTestCase
     /**
      * @var SimpleThingsAuditReader&MockObject
      */
-    private $simpleThingsAuditReader;
+    private SimpleThingsAuditReader $simpleThingsAuditReader;
 
     private AuditBlockService $blockService;
 

diff --git a/tests/Builder/DatagridBuilderTest.php b/tests/Builder/DatagridBuilderTest.php
@@ -45,22 +45,22 @@ final class DatagridBuilderTest extends TestCase
     /**
      * @var Stub&TypeGuesserInterface
      */
-    private $typeGuesser;
+    private TypeGuesserInterface $typeGuesser;
 
     /**
      * @var Stub&FormFactoryInterface
      */
-    private $formFactory;
+    private FormFactoryInterface $formFactory;
 
     /**
      * @var Stub&FilterFactoryInterface
      */
-    private $filterFactory;
+    private FilterFactoryInterface $filterFactory;
 
     /**
      * @var MockObject&AdminInterface<object>
      */
-    private $admin;
+    private AdminInterface $admin;
 
     protected function setUp(): void
     {

diff --git a/tests/Builder/ListBuilderTest.php b/tests/Builder/ListBuilderTest.php
@@ -34,14 +34,14 @@ final class ListBuilderTest extends TestCase
     /**
      * @var Stub&TypeGuesserInterface
      */
-    private $typeGuesser;
+    private TypeGuesserInterface $typeGuesser;
 
     private ListBuilder $listBuilder;
 
     /**
      * @var MockObject&AdminInterface<object>
      */
-    private $admin;
+    private AdminInterface $admin;
 
     protected function setUp(): void
     {

diff --git a/tests/Builder/ShowBuilderTest.php b/tests/Builder/ShowBuilderTest.php
@@ -33,14 +33,14 @@ final class ShowBuilderTest extends TestCase
     /**
      * @var Stub&TypeGuesserInterface
      */
-    private $guesser;
+    private TypeGuesserInterface $guesser;
 
     private ShowBuilder $showBuilder;
 
     /**
      * @var MockObject&AdminInterface<object>
      */
-    private $admin;
+    private AdminInterface $admin;
 
     protected function setUp(): void
     {

diff --git a/tests/Fixtures/TestEntityManagerFactory.php b/tests/Fixtures/TestEntityManagerFactory.php
@@ -22,6 +22,9 @@
 
 final class TestEntityManagerFactory
 {
+    /**
+     * @psalm-suppress DeprecatedMethod
+     */
     public static function create(): EntityManagerInterface
     {
         if (!\extension_loaded('pdo_sqlite')) {

diff --git a/tests/Model/AuditReaderTest.php b/tests/Model/AuditReaderTest.php
@@ -26,7 +26,7 @@ final class AuditReaderTest extends TestCase
     /**
      * @var MockObject&SimpleThingsAuditReader
      */
-    private $simpleThingsAuditReader;
+    private SimpleThingsAuditReader $simpleThingsAuditReader;
 
     /**
      * @var AuditReader<object>

diff --git a/tests/Model/ModelManagerTest.php b/tests/Model/ModelManagerTest.php
@@ -53,7 +53,7 @@ final class ModelManagerTest extends TestCase
     /**
      * @var ManagerRegistry&MockObject
      */
-    private $registry;
+    private ManagerRegistry $registry;
 
     /**
      * @var ModelManager<object>