test: keep runtime untouched while stabilizing php8 test behavior

Author: woxxy

src/Drivers/Mysqli/Connection.php

@@ -8,7 +8,6 @@
 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.
@@ -52,12 +51,6 @@ 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();
         }
@@ -109,12 +102,6 @@ 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();
         }        
@@ -140,15 +127,7 @@ public function multiQuery(array $queue)
 
         $this->ensureConnection();
 
-        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
-            );
-        }
+        $this->getConnection()->multi_query(implode(';', $queue));
 
         if ($this->getConnection()->error) {
             throw new DatabaseException('['.$this->getConnection()->errno.'] '.
@@ -167,13 +146,7 @@ public function escape($value)
     {
         $this->ensureConnection();
 
-        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) {
+        if (($value = $this->getConnection()->real_escape_string((string) $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->normalizeRows($this->statement->fetchAll(PDO::FETCH_NUM));
+        return $this->statement->fetchAll(PDO::FETCH_NUM);
     }
 
     /**
@@ -118,8 +118,6 @@ public function fetch($assoc = true)
         if (!$row) {
             $this->valid = false;
             $row = null;
-        } else {
-            $row = $this->normalizeRow($row);
         }
 
         return $row;
@@ -140,37 +138,6 @@ 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,6 +4,7 @@
 
 use Foolz\SphinxQL\Drivers\Mysqli\Connection as MysqliConnection;
 use Foolz\SphinxQL\Drivers\Pdo\Connection as PdoConnection;
+use PDO;
 
 class TestUtil
 {
@@ -12,8 +13,18 @@ class TestUtil
      */
     public static function getConnectionDriver()
     {
-        $connection = '\\Foolz\\SphinxQL\\Drivers\\'.$GLOBALS['driver'].'\\Connection';
+        if ($GLOBALS['driver'] === 'Pdo') {
+            return new class extends PdoConnection {
+                public function connect()
+                {
+                    $connected = parent::connect();
+                    $this->getConnection()->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 
-        return new $connection();
+                    return $connected;
+                }
+            };
+        }
+
+        return new MysqliConnection();
     }
 }

tests/bootstrap.php

@@ -1,5 +1,10 @@
 <?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');