Fix php8/mysql autocommit issue

str_contains for php<8

diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
index 67e0ea2ed5e880ffdc5f1c4c8705be688916a4bb..83459ec64340342688d65d0b83f83676767f8e7e 100644 (file)
--- a/.composer-require-checker.config.json
+++ b/.composer-require-checker.config.json
@@ -84,8 +84,10 @@
     "// DI functions",
     "DI\\autowire",
     "DI\\Container",
-    "DI\\ContainerBuilder"
+    "DI\\ContainerBuilder",
 
+    "//PHP8 functions",
+    "str_contains"
   ],
   "scan-files": [
     "galette/*.php",

diff --git a/galette/includes/functions.inc.php b/galette/includes/functions.inc.php
index d58118dc40416c404adc94edd92dfe3e889232d5..c1a5931734c864f59dd8683b06f6e9ea3a539df8 100644 (file)
--- a/galette/includes/functions.inc.php
+++ b/galette/includes/functions.inc.php
@@ -143,3 +143,21 @@ function get_numeric_posted_value($name, $defval)
     }
     return $defval;
 }
+
+if (!function_exists('str_contains')) {
+    /**
+     * PHP8 str_contains polyfill
+     *
+     * based on original work from the PHP Laravel framework
+     * see https://www.php.net/manual/fr/function.str-contains.php#125977
+     *
+     * @param string $haystack The string to search in.
+     * @param string $needle   The substring to search for in the haystack
+     *
+     * @return bool
+     */
+    function str_contains($haystack, $needle)
+    {
+        return $needle !== '' && mb_strpos($haystack, $needle) !== false;
+    }
+}

diff --git a/galette/lib/Galette/Core/Install.php b/galette/lib/Galette/Core/Install.php
index ed72a524c0b07cb18051f7636d08100a99a34194..0a0bf4f6c5f3b26d859534502050f223c58e33f2 100644 (file)
--- a/galette/lib/Galette/Core/Install.php
+++ b/galette/lib/Galette/Core/Install.php
@@ -774,7 +774,14 @@ class Install
         if ($fatal_error) {
             $zdb->connection->rollBack();
         } else {
-            $zdb->connection->commit();
+            try {
+                $zdb->connection->commit();
+            } catch (\PDOException $e) {
+                //to avoid php8/mysql autocommit issue
+                if ($zdb->isPostgres() || (!$zdb->isPostgres() && !str_contains($e->getMessage(), 'no active transaction'))) {
+                    throw $e;
+                }
+            }
         }
 
         $this->_report = array_merge($this->_report, $queries_results);