Remove vendored-in doctrine dbal

web/typo3conf/ext/ep_track/Classes/Service/RequestService.php

@@ -27,9 +27,8 @@ namespace EP\EpTrack\Service;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use EP\EpProducts\Utility\DbUtility;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Core\Database\DatabaseConnection;
+use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\TimeTracker\NullTimeTracker;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -55,6 +54,7 @@ class RequestService
 
     /**
      * @param string $currentUri
+     * @throws \Doctrine\DBAL\DBALException
      */
     public function matchRedirect($currentUri)
     {
@@ -64,7 +64,7 @@ class RequestService
             $uri .= '/';
         }
 
-        $qb = DbUtility::getDbConnection()->createQueryBuilder();
+        $qb = $this->getDbConnection()->createQueryBuilder();
 
         $redirect = $qb
             ->select('*')
@@ -190,4 +190,17 @@ class RequestService
 
         PageGenerator::pagegenInit();
     }
+
+    /**
+     * @return \TYPO3\CMS\Core\Database\Connection
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    protected function getDbConnection()
+    {
+        /** @var ConnectionPool $connectionPool */
+        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+
+        return $connectionPool->getConnectionByName('Default');
+    }
+
 }