fix: remove obsolete logic for old explain api version (resolves #7)

Author: tpetry

composer.json

@@ -19,8 +19,7 @@
         "php": "^8.0",
         "ext-pdo": "*",
         "guzzlehttp/guzzle": "^6.0|^7.0",
-        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "spatie/invade": "^1.0"
+        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.6",

phpstan-baseline.neon

@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 2
+			path: src/Helpers/DatabaseHelper.php
+
 		-
 			message: "#^Cannot access offset 'error' on mixed\\.$#"
 			count: 2
@@ -14,18 +19,3 @@ parameters:
 			message: "#^Part \\$response\\['message'\\] \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
 			count: 2
 			path: src/MySqlExplainException.php
-
-		-
-			message: "#^Parameter \\$explainJson of class Tpetry\\\\MysqlExplain\\\\Values\\\\QueryMetrics constructor expects string, float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/MysqlExplain.php
-
-		-
-			message: "#^Parameter \\$explainTree of class Tpetry\\\\MysqlExplain\\\\Values\\\\QueryMetrics constructor expects string\\|null, float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/MysqlExplain.php
-
-		-
-			message: "#^Parameter \\$version of class Tpetry\\\\MysqlExplain\\\\Values\\\\QueryMetrics constructor expects string, float\\|int\\|string\\|null given\\.$#"
-			count: 1
-			path: src/MysqlExplain.php

src/Helpers/DatabaseHelper.php

@@ -6,8 +6,6 @@
 
 use Illuminate\Database\Connection;
 use Illuminate\Support\Str;
-use PDO;
-use PDOStatement;
 
 /**
  * @internal
@@ -42,44 +40,15 @@ public function driverName(Connection $db): string
 
     /**
      * @param  mixed[]  $bindings
-     * @return int|float|string|null
      */
-    public function queryScalar(Connection $db, string $sql, array $bindings = []): mixed
+    public function queryScalar(Connection $db, string $sql, array $bindings = []): string
     {
-        return $this->executeQuery($db, $sql, $bindings, function (PDOStatement $statement): mixed {
-            /** @var int|float|string|null $value */
-            $value = $statement->fetchColumn();
-
-            return $value;
-        });
-    }
-
-    /**
-     * @template T
-     *
-     * @param  mixed[]  $bindings
-     * @param  (callable(\PDOStatement): T)  $fn
-     * @return T
-     */
-    private function executeQuery(Connection $db, string $sql, array $bindings, callable $fn): mixed
-    {
-        invade($db)->reconnectIfMissingConnection();
-        $pdo = $db->getPdo();
-
-        $emulatePrepares = $pdo->getAttribute(PDO::ATTR_EMULATE_PREPARES);
-        $errorMode = $pdo->getAttribute(PDO::ATTR_ERRMODE);
-        try {
-            $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-            $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        if (method_exists($db, 'scalar')) {
+            return (string) $db->scalar($sql, $bindings);
+        }
 
-            $statement = $pdo->prepare($sql);
-            $db->bindValues($statement, $db->prepareBindings($bindings));
-            $statement->execute();
+        $record = (array) $db->selectOne($sql, $bindings);
 
-            return $fn($statement);
-        } finally {
-            $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, $emulatePrepares);
-            $pdo->setAttribute(PDO::ATTR_ERRMODE, $errorMode);
-        }
+        return (string) reset($record);
     }
 }