BH-681: Update doctrine-bundle

Author: jmleroux

composer.json

@@ -55,24 +55,23 @@
         "ass/xmlsecurity": "1.1.1",
         "box/spout": "2.7.3",
         "doctrine/annotations": "1.13.2",
-        "doctrine/cache": "1.9.1",
-        "doctrine/collections": "1.6.4",
-        "doctrine/common": "2.13.3",
-        "doctrine/data-fixtures": "1.4.0",
-        "doctrine/dbal": "2.10.0",
-        "doctrine/doctrine-bundle": "1.12.0",
-        "doctrine/doctrine-fixtures-bundle": "3.3.0",
-        "doctrine/doctrine-migrations-bundle": "1.3.2",
-        "doctrine/event-manager": "1.1.0",
-        "doctrine/instantiator": "1.3.1",
-        "doctrine/migrations": "1.8.1",
-        "doctrine/orm": "2.7.0",
-        "doctrine/persistence": "1.3.3",
-        "doctrine/reflection": "1.0.0",
+        "doctrine/cache": "^1.12.1",
+        "doctrine/collections": "^1.6.8",
+        "doctrine/common": "^3.1.2",
+        "doctrine/data-fixtures": "^1.5.0",
+        "doctrine/dbal": "^2.13.2",
+        "doctrine/doctrine-bundle": "2.4.2",
+        "doctrine/doctrine-fixtures-bundle": "^3.4.0",
+        "doctrine/doctrine-migrations-bundle": "^2.2",
+        "doctrine/event-manager": "^1.1.1",
+        "doctrine/instantiator": "^1.4.0",
+        "doctrine/migrations": "^2.3.4",
+        "doctrine/orm": "^2.9.5",
+        "doctrine/persistence": "^2.2.2",
         "dompdf/dompdf" : "1.0.2",
         "elasticsearch/elasticsearch": "7.11.0",
         "friendsofsymfony/jsrouting-bundle": "2.7.0",
-        "friendsofsymfony/oauth-server-bundle": "1.6.2",
+        "friendsofsymfony/oauth-server-bundle": "dev-master",
         "friendsofsymfony/rest-bundle": "^3.0.5",
         "gedmo/doctrine-extensions":"v3.0.3",
         "google/cloud-pubsub": "1.29.1",
@@ -112,7 +111,7 @@
         "symfony/proxy-manager-bridge": "4.4.25",
         "symfony/requirements-checker": "^1.1",
         "symfony/routing": "4.4.25",
-        "symfony/security-acl": "3.0.2",
+        "symfony/security-acl": "^3.2.0",
         "symfony/security-bundle": "4.4.25",
         "symfony/security-core": "4.4.25",
         "symfony/security-csrf": "4.4.25",

config/packages/doctrine.yml

@@ -59,3 +59,5 @@ doctrine_migrations:
     dir_name: '%doctrine_migrations_dir%'
     namespace: Pim\Upgrade\Schema
     name: PIM Migrations
+    column_name: 'version'
+    column_length: 191

phpstan.neon

@@ -3,6 +3,7 @@ includes:
     - vendor/phpstan/phpstan-webmozart-assert/extension.neon
 parameters:
     reportUnmatchedIgnoredErrors: false
+    checkGenericClassInNonGenericObjectType: false
     symfony:
         container_xml_path: %rootDir%/../../../var/cache/dev/srcKernelDevDebugContainer.xml
     ignoreErrors:

src/Akeneo/Pim/Enrichment/Bundle/EventSubscriber/AttributeOption/LocalizableSubscriber.php

@@ -41,8 +41,6 @@ public function getSubscribedEvents()
 
     /**
      * After load
-     *
-     * @param LifecycleEventArgs $args
      */
     public function postLoad(LifecycleEventArgs $args)
     {

src/Akeneo/Pim/Enrichment/Component/Product/Repository/ReferenceDataRepositoryResolverInterface.php

@@ -2,6 +2,8 @@
 
 namespace Akeneo\Pim\Enrichment\Component\Product\Repository;
 
+use Doctrine\Persistence\ObjectRepository;
+
 /**
  * Resolves the repository given a reference data type
  *
@@ -14,7 +16,7 @@ interface ReferenceDataRepositoryResolverInterface
     /**
      * @param string $referenceDataType
      *
-     * @return \Doctrine\Common\Persistence\ObjectRepository
+     * @return ObjectRepository
      */
     public function resolve($referenceDataType);
 }

src/Akeneo/Tool/Bundle/BatchBundle/Persistence/Sql/GetJobExecutionIds.php

@@ -5,31 +5,34 @@
 namespace Akeneo\Tool\Bundle\BatchBundle\Persistence\Sql;
 
 use Akeneo\Tool\Component\Batch\Job\BatchStatus;
+use DateTime;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\PDOStatement;
+use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Types\Types;
+use InvalidArgumentException;
 
 /**
  * @copyright 2020 Akeneo SAS (http://www.akeneo.com)
  * @license   http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 final class GetJobExecutionIds
 {
-    /** @var Connection */
-    private $connection;
+    private Connection $connection;
 
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
     }
 
-    public function olderThanDays(int $days): PDOStatement
+    public function olderThanDays(int $days): ResultStatement
     {
         if ($days < 1) {
-            throw new \InvalidArgumentException(sprintf('Number of days should be strictly superior to 0, "%s% given', $days));
+            throw new InvalidArgumentException(
+                sprintf('Number of days should be strictly superior to 0, "%s given', $days)
+            );
         }
 
-        $endTime = new \DateTime();
+        $endTime = new DateTime();
         $endTime->modify(sprintf('- %d days', $days));
 
         $query = <<<SQL
@@ -41,7 +44,7 @@ public function olderThanDays(int $days): PDOStatement
                 WHERE last_job_execution.status = :status 
                 GROUP BY last_job_execution.job_instance_id
             )
-SQL;
+        SQL;
 
         return $this->connection->executeQuery(
             $query,
@@ -50,7 +53,7 @@ public function olderThanDays(int $days): PDOStatement
         );
     }
 
-    public function all(): PDOStatement
+    public function all(): ResultStatement
     {
         $query = <<<SQL
             SELECT id

src/Akeneo/Tool/Bundle/StorageUtilsBundle/spec/Doctrine/ORM/MappingsOverrideConfiguratorSpec.php

@@ -2,10 +2,10 @@
 
 namespace spec\Akeneo\Tool\Bundle\StorageUtilsBundle\Doctrine\ORM;
 
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 

src/Oro/Bundle/SecurityBundle/Acl/Persistence/AbstractAclManager.php

@@ -23,7 +23,7 @@ public function getSid($identity)
         if (is_string($identity)) {
             return new RoleSecurityIdentity($identity);
         } elseif ($identity instanceof RoleInterface) {
-            return new RoleSecurityIdentity($identity->getRole());
+            return new RoleSecurityIdentity($identity->getRole() ?? '');
         } elseif ($identity instanceof UserInterface) {
             return UserSecurityIdentity::fromAccount($identity);
         } elseif ($identity instanceof TokenInterface) {

symfony.lock

@@ -81,6 +81,9 @@
     "doctrine/dbal": {
         "version": "v2.7.2"
     },
+    "doctrine/deprecations": {
+        "version": "v0.5.3"
+    },
     "doctrine/doctrine-bundle": {
         "version": "1.6",
         "recipe": {
@@ -148,6 +151,9 @@
     "doctrine/reflection": {
         "version": "v1.0.0"
     },
+    "doctrine/sql-formatter": {
+        "version": "1.1.1"
+    },
     "dompdf/dompdf": {
         "version": "v0.6.2"
     },

tests/back/Pim/Enrichment/Specification/Bundle/Doctrine/ORM/Repository/ProductRepositorySpec.php

@@ -8,6 +8,7 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ObjectRepository;
 use PhpSpec\ObjectBehavior;
 use Akeneo\Pim\Structure\Component\ReferenceData\ConfigurationRegistryInterface;
 use Prophecy\Argument;
@@ -30,7 +31,7 @@ function it_is_a_product_repository()
 
     function it_is_an_object_repository()
     {
-        $this->shouldImplement('Doctrine\Common\Persistence\ObjectRepository');
+        $this->shouldImplement(ObjectRepository::class);
     }
 
     function it_checks_if_the_product_has_an_attribute_in_its_family(