[Task]: Prepare for DBAL v4, replace deprecated methods (#13619)

* task: replace deprecated changeColumn with modifyColumn * task: replace deprecated getSchemaManager with createSchemaManager * task: replace deprecated createSchema with introspectSchema * task: replace queryBuild::execute createSchema with executeQuery * task: bump to 3.5 when introspectSchema was introduced to fixtests
pimcore · Nov 28, 2022 · 631a520 · 631a520
1 parent 6590b4a
commit 631a520
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/bundles/AdminBundle/src/Controller/Admin/LogController.php b/bundles/AdminBundle/src/Controller/Admin/LogController.php
@@ -115,10 +115,10 @@ public function showAction(Request $request, Connection $db): JsonResponse
         $totalQb->setMaxResults(null)
             ->setFirstResult(0)
             ->select('COUNT(id) as count');
-        $total = $totalQb->execute()->fetch();
+        $total = $totalQb->executeQuery()->fetch();
         $total = (int) $total['count'];
 
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
         $result = $stmt->fetchAllAssociative();
 
         $logEntries = [];

diff --git a/bundles/CoreBundle/src/Migrations/Version20201008101817.php b/bundles/CoreBundle/src/Migrations/Version20201008101817.php
@@ -26,7 +26,7 @@ final class Version20201008101817 extends AbstractMigration
 {
     public function up(Schema $schema): void
     {
-        if (array_key_exists('documents_editables', $this->connection->getSchemaManager()->listViews())) {
+        if (array_key_exists('documents_editables', $this->connection->createSchemaManager()->listViews())) {
             $this->addSql('DROP VIEW IF EXISTS documents_editables;');
         }
 

diff --git a/bundles/CoreBundle/src/Migrations/Version20211018104331.php b/bundles/CoreBundle/src/Migrations/Version20211018104331.php
@@ -130,15 +130,15 @@ private function createForeignKey(Table $tableSchema, string $localForeignKeyCol
             $column = $tableSchema->getColumn($localForeignKeyColumn);
 
             if ($column->getPrecision() !== 10 || !($column->getType() instanceof IntegerType)) {
-                $tableSchema->changeColumn($localForeignKeyColumn, [
+                $tableSchema->modifyColumn($localForeignKeyColumn, [
                     'type' => new IntegerType(),
                     'precision' => 10,
                     'unsigned' => true,
                 ]);
             }
 
             if (!$column->hasCustomSchemaOption('unsigned') || $column->getCustomSchemaOption('unsigned') === false) {
-                $tableSchema->changeColumn($localForeignKeyColumn, ['unsigned' => true]);
+                $tableSchema->modifyColumn($localForeignKeyColumn, ['unsigned' => true]);
             }
 
             $tableSchema->addForeignKeyConstraint('objects', [$localForeignKeyColumn], ['o_id'], ['onDelete' => 'CASCADE'], $fkName);

diff --git a/bundles/EcommerceFrameworkBundle/src/IndexService/IndexUpdateService.php b/bundles/EcommerceFrameworkBundle/src/IndexService/IndexUpdateService.php
@@ -74,7 +74,7 @@ protected function fetchProductIdsForPreparationForSingleStoreTable(string $stor
     {
         $qb = $this->createBasicStoreTableSelectQuery($storeTableName, $tenantNameFilterList);
         $qb->andWhere('in_preparation_queue = 1');
-        $rows = $qb->execute()->fetchAllAssociative();
+        $rows = $qb->executeQuery()->fetchAllAssociative();
 
         $result = [];
 
@@ -129,7 +129,7 @@ protected function fetchProductIdsIndexUpdateForSingleStoreTable(string $storeTa
     {
         $qb = $this->createBasicStoreTableSelectQuery($storeTableName, $tenantNameFilterList);
         $qb->andWhere('crc_current != crc_index OR ISNULL(crc_index)');
-        $rows = $qb->execute()->fetchAllAssociative();
+        $rows = $qb->executeQuery()->fetchAllAssociative();
 
         $result = [];
         foreach ($rows as $row) {
@@ -218,7 +218,7 @@ protected function resetIds(array $idList, string $triggerInfo, bool $onlyResetU
                 $ids = implode(',', $idList);
                 $qb->where(sprintf('o_id in (%s)', $ids));
 
-                $qb->execute();
+                $qb->executeQuery();
             }
         }
     }

diff --git a/bundles/EcommerceFrameworkBundle/src/Tools/Installer.php b/bundles/EcommerceFrameworkBundle/src/Tools/Installer.php
@@ -386,6 +386,6 @@ public function needsReloadAfterInstall(): bool
 
     protected function getSchema(): Schema
     {
-        return $this->schema ??= $this->db->getSchemaManager()->createSchema();
+        return $this->schema ??= $this->db->createSchemaManager()->introspectSchema();
     }
 }
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
     "doctrine/annotations": "^1.13.1",
     "doctrine/collections": "^1.6.5",
     "doctrine/persistence": "^3.0.3",
-    "doctrine/dbal": "^3.4.2",
+    "doctrine/dbal": "^3.5",
     "doctrine/doctrine-bundle": "^2.6.3",
     "doctrine/doctrine-migrations-bundle": "^3.2.2",
     "doctrine/inflector": "^2.0.2",

diff --git a/lib/Targeting/Storage/DbStorage.php b/lib/Targeting/Storage/DbStorage.php
@@ -80,7 +80,7 @@ public function all(VisitorInfo $visitorInfo, string $scope): array
 
         $this->addExpiryParam($qb, $scope);
 
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
         $data = [];
 
         if ($stmt instanceof Result) {
@@ -114,7 +114,7 @@ public function has(VisitorInfo $visitorInfo, string $scope, string $name): bool
 
         $this->addExpiryParam($qb, $scope);
 
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
         $result = 0;
 
         if ($stmt instanceof Result) {
@@ -179,7 +179,7 @@ public function get(VisitorInfo $visitorInfo, string $scope, string $name, mixed
 
         $this->addExpiryParam($qb, $scope);
 
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
         $result = false;
 
         if ($stmt instanceof Result) {
@@ -304,7 +304,7 @@ private function loadDate(VisitorInfo $visitorInfo, string $scope, string $selec
 
         $this->addExpiryParam($qb, $scope);
 
-        $stmt = $qb->execute();
+        $stmt = $qb->executeQuery();
 
         if ($stmt instanceof Result) {
             return $this->convertToDateTime($stmt->fetchOne());

diff --git a/tests/Support/Helper/Pimcore.php b/tests/Support/Helper/Pimcore.php
@@ -248,7 +248,7 @@ protected function dropAndCreateDb(Connection $connection): void
         // use a dedicated setup connection as the framework connection is bound to the DB and will
         // fail if the DB doesn't exist
         $setupConnection = DriverManager::getConnection($params, $config);
-        $schemaManager = $setupConnection->getSchemaManager();
+        $schemaManager = $setupConnection->createSchemaManager();
 
         $databases = $schemaManager->listDatabases();
         if (in_array($dbName, $databases)) {