From 151acf6fd0c194122dacc620a8ce1453a7dad44c Mon Sep 17 00:00:00 2001
From: Fritz Michael Gschwantner <fmg@inspiredminds.at>
Date: Mon, 11 Apr 2022 13:21:30 +0200
Subject: [PATCH] Unlock Doctrine 3.x for Contao 4.13+ (#2)

---
 composer.json                           | 2 +-
 src/EventListener/DcaLoaderListener.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 449c286..892d645 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
         "symfony/dependency-injection": "^4.4 || ^5.0",
         "symfony/event-dispatcher": "^4.4 || ^5.0",
         "symfony/http-kernel": "^4.4 || ^5.0",
-        "doctrine/dbal": "^2.11",
+        "doctrine/dbal": "^2.11 || ^3.0",
         "geoip2/geoip2": "~2.0"
     },
     "require-dev": {
diff --git a/src/EventListener/DcaLoaderListener.php b/src/EventListener/DcaLoaderListener.php
index 7ddf89c..3051aae 100644
--- a/src/EventListener/DcaLoaderListener.php
+++ b/src/EventListener/DcaLoaderListener.php
@@ -108,16 +108,16 @@ private function addFieldsToDCA(string $table): void
 
     private function addHeaderInformation(string $table): void
     {
-        $previous = $GLOBALS['TL_DCA'][$table]['list']['sorting']['header_callback'];
+        $previous = $GLOBALS['TL_DCA'][$table]['list']['sorting']['header_callback'] ?? null;
 
         $GLOBALS['TL_DCA'][$table]['list']['sorting']['header_callback'] = function (array $header) use ($previous, $table): array {
             $act = (string) Input::get('act');
             $ptable = $GLOBALS['TL_DCA'][$table]['config']['ptable'];
 
             if ('' === $act || 'select' === $act || ('paste' === $act && 'create' === Input::get('mode'))) {
-                $parent = $this->connection->fetchAssoc("SELECT * FROM $ptable WHERE id=?", [(int) Input::get('id')]);
+                $parent = $this->connection->fetchAssociative("SELECT * FROM $ptable WHERE id=?", [(int) Input::get('id')]);
             } elseif ('paste' === $act) {
-                $parent = $this->connection->fetchAssoc("SELECT * FROM $ptable WHERE id=(SELECT pid FROM $table WHERE id=?)", [(int) Input::get('id')]);
+                $parent = $this->connection->fetchAssociative("SELECT * FROM $ptable WHERE id=(SELECT pid FROM $table WHERE id=?)", [(int) Input::get('id')]);
             }
 
             if (!$parent) {