de-duplicate reflector Error logic (#287)

Co-authored-by: Markus Staab <[email protected]>

Author: staabm

src/Error.php

@@ -4,6 +4,7 @@
 
 use staabm\PHPStanDba\QueryReflection\MysqliQueryReflector;
 use staabm\PHPStanDba\QueryReflection\PdoQueryReflector;
+use staabm\PHPStanDba\QueryReflection\QuerySimulation;
 
 /**
  * @phpstan-type ErrorCodes value-of<MysqliQueryReflector::MYSQL_ERROR_CODES>|value-of<PDOQueryReflector::PDO_ERROR_CODES>
@@ -47,6 +48,38 @@ public function asRuleMessage(): string
         return 'Query error: '.$this->getMessage().' ('.$this->getCode().').';
     }
 
+    /**
+     * @param ErrorCodes $code
+     */
+    public static function forSyntaxError(\Throwable $exception, $code, string $queryString): self
+    {
+        $message = $exception->getMessage();
+
+        // make error string consistent across mysql/mariadb
+        $message = str_replace(' MySQL server', ' MySQL/MariaDB server', $message);
+        $message = str_replace(' MariaDB server', ' MySQL/MariaDB server', $message);
+
+        // to ease debugging, print the error we simulated
+        $simulatedQuery = QuerySimulation::simulate($queryString);
+        $message = $message."\n\nSimulated query: ".$simulatedQuery;
+
+        return new self($message, $code);
+    }
+
+    /**
+     * @param ErrorCodes $code
+     */
+    public static function forException(\Throwable $exception, $code): self
+    {
+        $message = $exception->getMessage();
+
+        // make error string consistent across mysql/mariadb
+        $message = str_replace(' MySQL server', ' MySQL/MariaDB server', $message);
+        $message = str_replace(' MariaDB server', ' MySQL/MariaDB server', $message);
+
+        return new self($message, $code);
+    }
+
     /**
      * @param array{message: string, code: ErrorCodes} $array
      */

src/QueryReflection/MysqliQueryReflector.php

@@ -58,22 +58,14 @@ public function validateQueryString(string $queryString): ?Error
         $e = $result;
 
         if (\in_array($e->getCode(), self::MYSQL_ERROR_CODES, true)) {
-            $message = $e->getMessage();
-
-            // make error string consistent across mysql/mariadb
-            $message = str_replace(' MySQL server', ' MySQL/MariaDB server', $message);
-            $message = str_replace(' MariaDB server', ' MySQL/MariaDB server', $message);
-
-            // to ease debugging, print the error we simulated
             if (
                 self::MYSQL_SYNTAX_ERROR_CODE === $e->getCode()
                 && QueryReflection::getRuntimeConfiguration()->isDebugEnabled()
             ) {
-                $simulatedQuery = QuerySimulation::simulate($queryString);
-                $message = $message."\n\nSimulated query: ".$simulatedQuery;
+                return Error::forSyntaxError($e, $e->getCode(), $queryString);
             }
 
-            return new Error($message, $e->getCode());
+            return Error::forException($e, $e->getCode());
         }
 
         return null;

src/QueryReflection/PdoQueryReflector.php

@@ -76,22 +76,14 @@ public function validateQueryString(string $queryString): ?Error
 
         $e = $result;
         if (\in_array($e->getCode(), self::PDO_ERROR_CODES, true)) {
-            $message = $e->getMessage();
-
-            // make error string consistent across mysql/mariadb
-            $message = str_replace(' MySQL server', ' MySQL/MariaDB server', $message);
-            $message = str_replace(' MariaDB server', ' MySQL/MariaDB server', $message);
-
-            // to ease debugging, print the error we simulated
             if (
                 \in_array($e->getCode(), self::PDO_SYNTAX_ERROR_CODES, true)
                 && QueryReflection::getRuntimeConfiguration()->isDebugEnabled()
             ) {
-                $simulatedQuery = QuerySimulation::simulate($queryString);
-                $message = $message."\n\nSimulated query: '".$simulatedQuery."' Failed.";
+                return Error::forSyntaxError($e, $e->getCode(), $queryString);
             }
 
-            return new Error($message, $e->getCode());
+            return Error::forException($e, $e->getCode());
         }
 
         return null;