IBX-8471: Upgraded codebase to Symfony 7 (essentials)

composer.json

@@ -20,13 +20,14 @@
         "ext-mbstring": "*",
         "ext-xsl": "*",
         "composer/package-versions-deprecated": "^1.11",
-        "doctrine/dbal": "^2.13.0",
-        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/annotations": "^2.0",
+        "doctrine/dbal": "^3.7.0",
+        "doctrine/doctrine-bundle": "^2.11.0",
         "doctrine/orm": "^2.7",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "friendsofsymfony/http-cache-bundle": "^2.8",
+        "friendsofsymfony/http-cache-bundle": "^3.0",
         "friendsofsymfony/jsrouting-bundle": "^3.5",
-        "ibexa/doctrine-schema": "~5.0.x-dev",
+        "ibexa/doctrine-schema": "dev-ibx-8471-symfony-7 as 5.0.x-dev",
         "jms/translation-bundle": "^2.4",
         "league/flysystem-memory": "^2.0.6",
         "liip/imagine-bundle": "^2.3",
@@ -35,44 +36,43 @@
         "pagerfanta/pagerfanta": "^3.6.2",
         "psr/event-dispatcher": "^1.0",
         "symfony-cmf/routing": "^3.0",
-        "symfony/cache": "^6.4.0",
-        "symfony/console": "^6.4.0",
-        "symfony/dependency-injection": "^6.4.0",
-        "symfony/event-dispatcher": "^6.4.0",
-        "symfony/expression-language": "^6.4.0",
-        "symfony/framework-bundle": "^6.4.0",
-        "symfony/http-client": "^6.4.0",
-        "symfony/http-foundation": "^6.4.0",
-        "symfony/http-kernel": "^6.4.0",
-        "symfony/mime": "^6.4.0",
+        "symfony/cache": "^7.2",
+        "symfony/console": "^7.2",
+        "symfony/dependency-injection": "^7.2",
+        "symfony/event-dispatcher": "^7.2",
+        "symfony/expression-language": "^7.2",
+        "symfony/framework-bundle": "^7.2",
+        "symfony/http-client": "^7.2",
+        "symfony/http-foundation": "^7.2",
+        "symfony/http-kernel": "^7.2",
+        "symfony/mime": "^7.2",
         "symfony/polyfill-php80": "^1.27",
-        "symfony/process": "^6.4.0",
-        "symfony/security-bundle": "^6.4.0",
-        "symfony/security-core": "^6.4.0",
-        "symfony/security-http": "^6.4.0",
-        "symfony/serializer": "^6.4.0",
+        "symfony/process": "^7.2",
+        "symfony/security-bundle": "^7.2",
+        "symfony/security-core": "^7.2",
+        "symfony/security-http": "^7.2",
+        "symfony/serializer": "^7.2",
         "symfony/templating": "^6.4.0",
-        "symfony/translation": "^6.4.0",
-        "symfony/validator": "^6.4.0",
-        "symfony/var-dumper": "^6.4.0",
-        "symfony/yaml": "^6.4.0",
+        "symfony/translation": "^7.2",
+        "symfony/validator": "^7.2",
+        "symfony/var-dumper": "^7.2",
+        "symfony/yaml": "^7.2",
         "twig/extra-bundle": "^3.0",
         "twig/twig": ">=3.0 <3.16 || ^3.19.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
         "friends-of-behat/mink-extension": "^2.4",
         "ibexa/code-style": "~2.0.0",
-        "ibexa/rector": "~5.0.x-dev",
+        "ibexa/rector": "dev-ibx-8471-symfony-7 as 5.0.x-dev",
         "jenner/simple_fork": "^1.2",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^5.0",
         "phpstan/phpstan": "^2.0",
         "phpstan/phpstan-phpunit": "^2.0",
         "phpstan/phpstan-symfony": "^2.0",
         "phpunit/phpunit": "^9.6",
-        "symfony/phpunit-bridge": "^5.4",
-        "symfony/proxy-manager-bridge": "^6.4",
-        "symfony/runtime": "^6.4.0"
+        "symfony/phpunit-bridge": "^7.2",
+        "symfony/runtime": "^7.2"
     },
     "conflict": {
         "doctrine/dbal": "2.7.0",

src/bundle/Core/Cache/Warmer/ProxyCacheWarmer.php

@@ -47,7 +47,7 @@ public function isOptional(): bool
         return false;
     }
 
-    public function warmUp($cacheDir): array
+    public function warmUp($cacheDir, ?string $buildDir = null): array
     {
         $this->proxyGenerator->warmUp(self::PROXY_CLASSES);
 

src/bundle/Core/Command/CleanupVersionsCommand.php

@@ -273,8 +273,7 @@ protected function getObjectsIds($keep, $status, $excludedContentTypes = [])
                 )->setParameter('contentTypes', $excludedContentTypes, Connection::PARAM_STR_ARRAY);
         }
 
-        /** @var \Doctrine\DBAL\ForwardCompatibility\Result<int> $stmt */
-        $stmt = $query->execute();
+        $stmt = $query->executeQuery();
 
         return $stmt->fetchFirstColumn();
     }

src/bundle/Core/Command/UpdateTimestampsToUTCCommand.php

@@ -321,7 +321,7 @@ protected function getTimestampBasedFields($offset, $limit)
                 ->setParameter('toTimestamp', $this->to);
         }
 
-        $statement = $query->execute();
+        $statement = $query->executeQuery();
 
         return $statement->fetchAll(PDO::FETCH_ASSOC);
     }
@@ -359,7 +359,7 @@ protected function countTimestampBasedFields(): int
                 ->setParameter('toTimestamp', $this->to);
         }
 
-        $statement = $query->execute();
+        $statement = $query->executeQuery();
 
         return (int) $statement->fetchColumn();
     }
@@ -471,7 +471,7 @@ protected function updateTimestampToUTC(
             ->setParameter('id', $contentAttributeId)
             ->setParameter('version', $contentAttributeVersion);
 
-        $query->execute();
+        $query->executeStatement();
     }
 
     /**

src/bundle/Core/Command/VirtualFieldDuplicateFixCommand.php

@@ -165,7 +165,7 @@ private function getDuplicatedAttributeTotalCount(
             ->from('ezcontentobject_attribute', 'a')
             ->having('instances > 1');
 
-        $count = (int) $query->execute()->rowCount();
+        $count = (int) $query->executeQuery()->rowCount();
 
         if ($count > 0) {
             $style->warning(
@@ -200,7 +200,7 @@ private function getDuplicatedAttributesBatch(int $batchSize): array
             ->setFirstResult(0)
             ->setMaxResults($batchSize);
 
-        return $query->execute()->fetchAllAssociative();
+        return $query->executeQuery()->fetchAllAssociative();
     }
 
     /**
@@ -229,7 +229,7 @@ private function getDuplicatedAttributeIds(array $attribute): array
             ->setFirstResult(1);
 
         $query->setParameters($attribute);
-        $result = $query->execute()->fetchFirstColumn();
+        $result = $query->executeQuery()->fetchFirstColumn();
 
         return array_map('intval', $result);
     }
@@ -259,6 +259,6 @@ private function deleteAttributes(array $ids): int
             ->delete('ezcontentobject_attribute')
             ->andWhere($query->expr()->in('id', array_map('strval', $ids)));
 
-        return (int)$query->execute();
+        return (int)$query->executeStatement();
     }
 }

src/bundle/Core/Imagine/VariationPurger/LegacyStorageImageFileRowReader.php

@@ -26,7 +26,7 @@ public function init()
     {
         $selectQuery = $this->connection->createQueryBuilder();
         $selectQuery->select('filepath')->from('ezimagefile');
-        $this->statement = $selectQuery->execute();
+        $this->statement = $selectQuery->executeQuery();
     }
 
     public function getRow()

src/bundle/IO/IbexaIOBundle.php

@@ -16,9 +16,6 @@
 
 class IbexaIOBundle extends Bundle
 {
-    /** @var \Ibexa\Bundle\IO\DependencyInjection\IbexaIOExtension|null */
-    protected $extension;
-
     public function build(ContainerBuilder $container): void
     {
         /** @var \Ibexa\Bundle\IO\DependencyInjection\IbexaIOExtension $extension */

src/bundle/IO/Migration/FileLister/FileRowReader/LegacyStorageFileRowReader.php

@@ -29,7 +29,7 @@ final public function init()
         $selectQuery
             ->select('filename', 'mime_type')
             ->from($this->getStorageTable());
-        $this->statement = $selectQuery->execute();
+        $this->statement = $selectQuery->executeQuery();
     }
 
     /**

src/contracts/FieldType/GatewayBasedStorage.php

@@ -20,11 +20,9 @@ abstract class GatewayBasedStorage implements FieldStorage
     /**
      * Field Type External Storage Gateway.
      *
-     * @var \Ibexa\Contracts\Core\FieldType\StorageGatewayInterface
-     *
      * @phpstan-var T
      */
-    protected $gateway;
+    protected StorageGatewayInterface $gateway;
 
     /**
      * @param \Ibexa\Contracts\Core\FieldType\StorageGatewayInterface $gateway

src/contracts/Test/Persistence/Fixture/FixtureImporter.php

@@ -77,7 +77,7 @@ private function truncateTables(array $tables): void
                 );
             } catch (DBALException | PDOException $e) {
                 // Fallback to DELETE if TRUNCATE failed (because of FKs for instance)
-                $this->connection->createQueryBuilder()->delete($table)->execute();
+                $this->connection->createQueryBuilder()->delete($table)->executeStatement();
             }
         }
     }

src/lib/FieldType/BinaryBase/BinaryBaseStorage.php

@@ -38,7 +38,7 @@ class BinaryBaseStorage extends GatewayBasedStorage
     protected PathGeneratorInterface $downloadUrlGenerator;
 
     /** @var \Ibexa\Core\FieldType\BinaryBase\BinaryBaseStorage\Gateway */
-    protected $gateway;
+    protected StorageGatewayInterface $gateway;
 
     /** @var \Ibexa\Core\FieldType\Validator\FileExtensionBlackListValidator */
     protected $fileExtensionBlackListValidator;

src/lib/FieldType/BinaryBase/BinaryBaseStorage/Gateway/DoctrineStorage.php

@@ -176,7 +176,7 @@ protected function updateFieldData(VersionInfo $versionInfo, Field $field)
             ->setParameter('versionNo', $versionInfo->versionNo, ParameterType::INTEGER)
         ;
 
-        $updateQuery->execute();
+        $updateQuery->executeQuery();
     }
 
     /**
@@ -192,7 +192,7 @@ protected function storeNewFieldData(VersionInfo $versionInfo, Field $field)
 
         $this->setInsertColumns($insertQuery, $versionInfo, $field);
 
-        $insertQuery->execute();
+        $insertQuery->executeStatement();
     }
 
     /**
@@ -241,7 +241,7 @@ public function getFileReferenceData($fieldId, $versionNo)
             ->setParameter('versionNo', $versionNo, PDO::PARAM_INT)
         ;
 
-        $statement = $selectQuery->execute();
+        $statement = $selectQuery->executeQuery();
 
         $result = $statement->fetchAll(PDO::FETCH_ASSOC);
 
@@ -337,7 +337,7 @@ public function removeFileReferences(array $fieldIds, $versionNo)
             ->setParameter('versionNo', $versionNo, PDO::PARAM_INT)
         ;
 
-        $deleteQuery->execute();
+        $deleteQuery->executeStatement();
     }
 
     /**
@@ -367,7 +367,7 @@ public function removeFileReference($fieldId, $versionNo)
             ->setParameter('versionNo', $versionNo, PDO::PARAM_INT)
         ;
 
-        $deleteQuery->execute();
+        $deleteQuery->executeStatement();
     }
 
     /**
@@ -406,7 +406,7 @@ public function getReferencedFiles(array $fieldIds, $versionNo)
             ->setParameter('versionNo', $versionNo, PDO::PARAM_INT)
         ;
 
-        $statement = $selectQuery->execute();
+        $statement = $selectQuery->executeQuery();
 
         return array_map(
             function ($row) {
@@ -460,7 +460,7 @@ public function countFileReferences(array $files)
             )
         ;
 
-        $statement = $selectQuery->execute();
+        $statement = $selectQuery->executeQuery();
 
         $countMap = [];
         foreach ($statement->fetchAll(PDO::FETCH_ASSOC) as $row) {

src/lib/FieldType/Image/ImageStorage.php

@@ -32,7 +32,7 @@ class ImageStorage extends GatewayBasedStorage
     protected $aliasCleaner;
 
     /** @var \Ibexa\Core\FieldType\Image\ImageStorage\Gateway */
-    protected $gateway;
+    protected StorageGatewayInterface $gateway;
 
     /** @var \Ibexa\Core\IO\FilePathNormalizerInterface */
     protected $filePathNormalizer;