Open bundle to doctrine/dbal v2.x and v3.x

rich-id · Mar 14, 2022 · 475e0fe · 475e0fe
1 parent 47929bd
commit 475e0fe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.1.12
+
+- Open bundle to doctrine/dbal v2.x and v3.x
+
 ## Version 0.1.11
 
 - Fix dependency to force doctrine/dbal v2, this lib is not compatible with v3 yet

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": "^7.1 || ^8.0",
-        "doctrine/dbal": "^2.3",
+        "doctrine/dbal": "^2.3 || ^3.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "richcongress/bundle-toolbox": "*",
         "richcongress/fixture-test": "^0.1",

diff --git a/src/Doctrine/EventListener/SqliteRegexOnPostConnection.php b/src/Doctrine/EventListener/SqliteRegexOnPostConnection.php
@@ -18,15 +18,25 @@ public function postConnect(ConnectionEventArgs $args): void
             return;
         }
 
-        $connection->sqliteCreateFunction(
+        // For doctrine/dbal 2.x
+        if (\method_exists($connection, 'sqliteCreateFunction')) {
+            $nativeConnection = $connection;
+            // For doctrine/dbal 3.x
+        } elseif (\method_exists($connection, 'getNativeConnection')) {
+            $nativeConnection = $connection->getNativeConnection();
+        } else {
+            throw new \InvalidArgumentException('Unsupported doctrine pdo version.');
+        }
+
+        $nativeConnection->sqliteCreateFunction(
             'REGEXP',
             static function (string $regex, string $value): int {
 
                 return preg_match('/' . $regex . '/u', $value) ?: 0;
             }
         );
 
-        $connection->sqliteCreateFunction(
+        $nativeConnection->sqliteCreateFunction(
             'REGEXP_REPLACE',
             static function (string $value, string $regex, string $replace): string {
                 return preg_replace('/' . $regex . '/u', $replace, $value);