feat!: drop php<8.2 and align PDO/MySQLi result behavior

Author: woxxy

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4', '8.0', '8.1']
+        php: ['8.2', '8.3']
         driver: [mysqli, pdo]
         search_build: [SPHINX2, SPHINX3, MANTICORE]
     env:

CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 4.0.0
+* Dropped support for PHP 8.1 and lower (minimum PHP is now 8.2)
+* Updated CI PHP matrix to 8.2 and 8.3
+* Restored runtime-level driver normalization for PDO/MySQLi scalar fetch values
+* Normalized MySQLi driver exception handling for modern PHP `mysqli_sql_exception` behavior
+
 #### 3.0.2
 * Dropped support for PHP 7.3 and lower
 

README.md

@@ -10,7 +10,7 @@ Query Builder for SphinxQL
 
 This is a SphinxQL Query Builder used to work with SphinxQL, a SQL dialect used with the Sphinx search engine and it's fork Manticore. It maps most of the functions listed in the [SphinxQL reference](http://sphinxsearch.com/docs/current.html#SphinxQL-reference) and is generally [faster](http://sphinxsearch.com/blog/2010/04/25/sphinxapi-vs-SphinxQL-benchmark/) than the available Sphinx API.
 
-This Query Builder has no dependencies except PHP 7.1 or later, `\MySQLi` extension, `PDO`, and [Sphinx](http://sphinxsearch.com)/[Manticore](https://manticoresearch.com).
+This Query Builder has no dependencies except PHP 8.2 or later, `\MySQLi` extension, `PDO`, and [Sphinx](http://sphinxsearch.com)/[Manticore](https://manticoresearch.com).
 
 ### Missing methods?
 

composer.json

@@ -12,7 +12,7 @@
         "irc": "irc://irc.irchighway.net/fooldriver"
     },
     "require": {
-        "php": "^7.1 || ^8"
+        "php": "^8.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^7 || ^8 || ^9"

src/Drivers/Mysqli/Connection.php

@@ -8,6 +8,7 @@
 use Foolz\SphinxQL\Exception\ConnectionException;
 use Foolz\SphinxQL\Exception\DatabaseException;
 use Foolz\SphinxQL\Exception\SphinxQLException;
+use mysqli_sql_exception;
 
 /**
  * SphinxQL connection class utilizing the MySQLi extension.
@@ -51,6 +52,12 @@ public function connect()
             if (!$conn->real_connect($data['host'], null, null, null, (int) $data['port'], $data['socket'])) {
                 throw new ConnectionException('Connection Error: ['.$conn->connect_errno.']'.$conn->connect_error);
             }
+        } catch (mysqli_sql_exception $exception) {
+            throw new ConnectionException(
+                'Connection Error: ['.$exception->getCode().']'.$exception->getMessage(),
+                (int) $exception->getCode(),
+                $exception
+            );
         } finally {
             restore_error_handler();
         }
@@ -102,9 +109,15 @@ public function query($query)
              * ERROR mysqli::prepare(): (08S01/1047): unknown command (code=22) - prepare() not implemented by Sphinx/Manticore
              */
             $resource = @$this->getConnection()->query($query);
+        } catch (mysqli_sql_exception $exception) {
+            throw new DatabaseException(
+                '['.$exception->getCode().'] '.$exception->getMessage().' [ '.$query.']',
+                (int) $exception->getCode(),
+                $exception
+            );
         } finally {
             restore_error_handler();
-        }        
+        }
 
         if ($this->getConnection()->error) {
             throw new DatabaseException('['.$this->getConnection()->errno.'] '.
@@ -127,7 +140,15 @@ public function multiQuery(array $queue)
 
         $this->ensureConnection();
 
-        $this->getConnection()->multi_query(implode(';', $queue));
+        try {
+            $this->getConnection()->multi_query(implode(';', $queue));
+        } catch (mysqli_sql_exception $exception) {
+            throw new DatabaseException(
+                '['.$exception->getCode().'] '.$exception->getMessage().' [ '.implode(';', $queue).']',
+                (int) $exception->getCode(),
+                $exception
+            );
+        }
 
         if ($this->getConnection()->error) {
             throw new DatabaseException('['.$this->getConnection()->errno.'] '.
@@ -146,7 +167,13 @@ public function escape($value)
     {
         $this->ensureConnection();
 
-        if (($value = $this->getConnection()->real_escape_string((string) $value)) === false) {
+        try {
+            $value = $this->getConnection()->real_escape_string((string) $value);
+        } catch (mysqli_sql_exception $exception) {
+            throw new DatabaseException($exception->getMessage(), (int) $exception->getCode(), $exception);
+        }
+
+        if ($value === false) {
             // @codeCoverageIgnoreStart
             throw new DatabaseException($this->getConnection()->error, $this->getConnection()->errno);
             // @codeCoverageIgnoreEnd

src/Drivers/Pdo/ResultSetAdapter.php

@@ -69,7 +69,7 @@ public function isDml()
      */
     public function store()
     {
-        return $this->statement->fetchAll(PDO::FETCH_NUM);
+        return $this->normalizeRows($this->statement->fetchAll(PDO::FETCH_NUM));
     }
 
     /**
@@ -118,6 +118,8 @@ public function fetch($assoc = true)
         if (!$row) {
             $this->valid = false;
             $row = null;
+        } else {
+            $row = $this->normalizeRow($row);
         }
 
         return $row;
@@ -138,6 +140,37 @@ public function fetchAll($assoc = true)
             $this->valid = false;
         }
 
+        return $this->normalizeRows($row);
+    }
+
+    /**
+     * Cast scalar non-string values to string to keep PDO and MySQLi
+     * result typing aligned across PHP versions.
+     *
+     * @param array $row
+     * @return array
+     */
+    protected function normalizeRow(array $row)
+    {
+        foreach ($row as $key => $value) {
+            if (is_scalar($value) && !is_string($value)) {
+                $row[$key] = (string) $value;
+            }
+        }
+
         return $row;
     }
+
+    /**
+     * @param array $rows
+     * @return array
+     */
+    protected function normalizeRows(array $rows)
+    {
+        foreach ($rows as $index => $row) {
+            $rows[$index] = $this->normalizeRow($row);
+        }
+
+        return $rows;
+    }
 }

tests/SphinxQL/TestUtil.php

@@ -4,7 +4,6 @@
 
 use Foolz\SphinxQL\Drivers\Mysqli\Connection as MysqliConnection;
 use Foolz\SphinxQL\Drivers\Pdo\Connection as PdoConnection;
-use PDO;
 
 class TestUtil
 {
@@ -13,18 +12,8 @@ class TestUtil
      */
     public static function getConnectionDriver()
     {
-        if ($GLOBALS['driver'] === 'Pdo') {
-            return new class extends PdoConnection {
-                public function connect()
-                {
-                    $connected = parent::connect();
-                    $this->getConnection()->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
+        $connection = '\\Foolz\\SphinxQL\\Drivers\\'.$GLOBALS['driver'].'\\Connection';
 
-                    return $connected;
-                }
-            };
-        }
-
-        return new MysqliConnection();
+        return new $connection();
     }
 }

tests/bootstrap.php

@@ -1,10 +1,5 @@
 <?php
 
-// Keep MySQLi behavior stable across PHP versions in test runs.
-if (function_exists('mysqli_report') && defined('MYSQLI_REPORT_OFF')) {
-    mysqli_report(MYSQLI_REPORT_OFF);
-}
-
 // PHPUnit Backwards Compatability Fix
 if (!class_exists('\PHPUnit\Framework\TestCase')) {
     class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');