From 852b926252912058d1651de67639d809a42f35a1 Mon Sep 17 00:00:00 2001
From: David Molineus <david.molineus@netzmacht.de>
Date: Mon, 21 Feb 2022 20:11:56 +0100
Subject: [PATCH] Support doctrine/dbal 3

---
 src/Listener/Dca/ControlDcaListener.php |  8 ++++----
 src/Listener/Dca/LayerDcaListener.php   | 12 ++++++------
 src/Listener/Dca/MapDcaListener.php     | 16 ++++++----------
 src/Listener/Dca/MarkerDcaListener.php  |  4 ++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/Listener/Dca/ControlDcaListener.php b/src/Listener/Dca/ControlDcaListener.php
index af820d5..d69f807 100644
--- a/src/Listener/Dca/ControlDcaListener.php
+++ b/src/Listener/Dca/ControlDcaListener.php
@@ -147,9 +147,9 @@ class ControlDcaListener extends AbstractListener
         $statement = $this->connection->prepare($query);
 
         $statement->bindValue('cid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        return $statement->fetchAll();
+        return $result->fetchAllAssociative();
     }
 
     /**
@@ -167,9 +167,9 @@ class ControlDcaListener extends AbstractListener
         $query     = 'SELECT * FROM tl_leaflet_control_layer WHERE cid=:cid order BY sorting';
         $statement = $this->connection->prepare($query);
         $statement->bindValue('cid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        while ($row = $statement->fetch()) {
+        while ($row = $result->fetchAssociative()) {
             $values[$row['lid']] = $row;
         }
 
diff --git a/src/Listener/Dca/LayerDcaListener.php b/src/Listener/Dca/LayerDcaListener.php
index 120de1e..664853b 100644
--- a/src/Listener/Dca/LayerDcaListener.php
+++ b/src/Listener/Dca/LayerDcaListener.php
@@ -361,25 +361,25 @@ class LayerDcaListener extends AbstractListener
         if ($undoId) {
             $statement = $this->connection->prepare('SELECT * FROM tl_undo WHERE id=:id LIMIT 0,1');
             $statement->bindValue('id', $undoId);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
-            $undo = $statement->fetch();
+            $undo = $result->fetchAssociative();
 
             $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE lid=:lid');
             $statement->bindValue('lid', $dataContainer->id);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
             $undo['data'] = StringUtil::deserialize($undo['data'], true);
 
-            while ($row = $statement->fetch()) {
+            while ($row = $result->fetchAssociative()) {
                 $undo['data']['tl_leaflet_map_layer'][] = $row;
             }
 
             $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_control_layer WHERE lid=:lid');
             $statement->bindValue('lid', $dataContainer->id);
-            $statement->execute();
+            $result = $statement->executeQuery();
 
-            $undo['data']['tl_leaflet_control_layer'] = $statement->fetchAll();
+            $undo['data']['tl_leaflet_control_layer'] = $result->fetchAllAssociative();
 
             $this->connection->update('tl_undo', ['data' => $undo['data']], ['id' => $undo['id']]);
         }
diff --git a/src/Listener/Dca/MapDcaListener.php b/src/Listener/Dca/MapDcaListener.php
index c345334..66b882a 100644
--- a/src/Listener/Dca/MapDcaListener.php
+++ b/src/Listener/Dca/MapDcaListener.php
@@ -24,7 +24,6 @@ use Netzmacht\Contao\Toolkit\Data\Model\RepositoryManager;
 use Netzmacht\Contao\Toolkit\Dca\Listener\AbstractListener;
 use Netzmacht\Contao\Toolkit\Dca\Manager;
 use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
-use PDO;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Translation\TranslatorInterface as Translator;
 
@@ -136,12 +135,9 @@ class MapDcaListener extends AbstractListener
     {
         $statement = $this->connection->prepare('SELECT lid FROM tl_leaflet_map_layer WHERE mid=:mid ORDER BY sorting');
         $statement->bindValue('mid', $dataContainer->id);
+        $result = $statement->executeQuery();
 
-        if ($statement->execute()) {
-            return $statement->fetchAll(PDO::FETCH_COLUMN, 0);
-        }
-
-        return [];
+        return $result->fetchFirstColumn();
     }
 
     /**
@@ -159,9 +155,9 @@ class MapDcaListener extends AbstractListener
         $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
 
         $statement->bindValue('mid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        while ($row = $statement->fetch()) {
+        while ($row = $result->fetchAssociative()) {
             $values[$row['lid']] = $row;
         }
 
@@ -239,9 +235,9 @@ class MapDcaListener extends AbstractListener
     {
         $statement = $this->connection->prepare('SELECT * FROM tl_leaflet_map_layer WHERE mid=:mid order BY sorting');
         $statement->bindValue('mid', $dataContainer->id);
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
+        while ($row = $result->fetchAssociative()) {
             unset($row['id']);
             $row['tstamp'] = time();
             $row['mid']    = $insertId;
diff --git a/src/Listener/Dca/MarkerDcaListener.php b/src/Listener/Dca/MarkerDcaListener.php
index 741657c..0ad9df4 100644
--- a/src/Listener/Dca/MarkerDcaListener.php
+++ b/src/Listener/Dca/MarkerDcaListener.php
@@ -145,9 +145,9 @@ class MarkerDcaListener
         $statement = $this->connection->prepare($query);
         $statement->bindValue('id', $dataContainer->id);
 
-        $statement->execute();
+        $result = $statement->executeQuery();
 
-        if ($row = $statement->fetch()) {
+        if ($row = $result->fetchAssociative()) {
             $buffer = $row['latitude'];
 
             if ($buffer && $row['longitude']) {