WIP

composer.json

@@ -1,23 +1,27 @@
 {
   "name": "actuallyconnor/pseudo",
   "description": "PDO/MySQL Connection Mocking",
+  "type": "library",
   "license": "MIT",
   "authors": [
     {
       "name": "Connor Smyth",
-      "email": "[email protected]"
+      "email": "[email protected]",
+      "homepage": "https://connorsmyth.com",
+      "role": "Developer"
     },
     {
       "name": "Josh Butts",
-      "email": "[email protected]"
+      "email": "[email protected]",
+      "role": "Original Developer"
     }
   ],
   "require": {
-    "php": ">=8.0",
-    "ext-pdo": "*",
-    "ext-ctype": "*"
+    "php": ">=8.0"
   },
   "require-dev": {
+    "ext-pdo": "*",
+    "ext-ctype": "*",
     "phpunit/phpunit": "^11.3"
   },
   "autoload": {

src/Pseudo/ParsedQuery.php

@@ -5,7 +5,6 @@
 
 class ParsedQuery
 {
-    private mixed $parsedQuery;
     private string $rawQuery;
     private string $hash;
 
@@ -15,10 +14,8 @@ class ParsedQuery
     public function __construct(string $query)
     {
         $parser = new PHPSQLParser();
-        $this->parsedQuery = $parser->parse($query);
         $this->rawQuery = $query;
         $this->hash = sha1($query);
-        $test = 0;
     }
 
     public function isEqualTo($query)

src/Pseudo/Pdo.php

@@ -20,6 +20,9 @@ public function __construct(
         $this->queryLog = new QueryLog();
     }
 
+    /**
+     * @throws Exception
+     */
     public function prepare($query, $options = null): PdoStatement
     {
         $result = $this->mockedQueries->getResult($query);
@@ -33,7 +36,6 @@ public function beginTransaction(): bool
             return true;
         }
         return false;
-        // not yet implemented
     }
 
     public function commit(): bool
@@ -43,7 +45,6 @@ public function commit(): bool
             return true;
         }
         return false;
-        // not yet implemented
     }
 
     public function rollBack(): bool
@@ -53,8 +54,8 @@ public function rollBack(): bool
 
             return true;
         }
-        // not yet implemented
-        return true;
+
+        return false;
     }
 
     public function inTransaction(): bool
@@ -64,40 +65,42 @@ public function inTransaction(): bool
 
     public function setAttribute($attribute, $value): bool
     {
-        // not yet implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function exec($statement): false|int
     {
         $result = $this->query($statement);
-        if ($result) {
-            return $result->rowCount();
-        }
-        return 0;
+
+        return $result->rowCount();
     }
 
     /**
      * @param string $query
      * @param int|null $fetchMode
      * @param mixed ...$fetchModeArgs
      * @return PdoStatement
+     * @throws Exception
      */
     public function query(string $query, ?int $fetchMode = null, mixed ...$fetchModeArgs): PdoStatement
     {
         if ($this->mockedQueries->exists($query)) {
             $result = $this->mockedQueries->getResult($query);
-            if ($result) {
-                $this->queryLog->addQuery($query);
-                $statement = new PdoStatement();
-                $statement->setResult($result);
-                return $statement;
-            }
+
+            $this->queryLog->addQuery($query);
+            $statement = new PdoStatement();
+            $statement->setResult($result);
+
+            return $statement;
         }
+
+        throw new Exception('Unable to convert query to PdoStatement');
     }
 
     /**
      * @param null $name
      * @return false|string
+     * @throws Exception
      */
     public function lastInsertId($name = null): false|string
     {
@@ -122,35 +125,33 @@ private function getLastResult(): Result|false
             return false;
         }
 
-        $result = $this->mockedQueries->getResult($lastQuery);
-
-        return $result;
+        return $this->mockedQueries->getResult($lastQuery);
     }
 
     public function errorCode(): ?string
     {
-        // not yet implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function errorInfo(): array
     {
-        // not yet implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function getAttribute($attribute)
     {
-        // not yet implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function quote($string, $type = PDO::PARAM_STR): false|string
     {
-        // not yet implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     /**
      * @param string $filePath
      */
-    public function save($filePath): void
+    public function save(string $filePath): void
     {
         file_put_contents($filePath, serialize($this->mockedQueries));
     }
@@ -164,16 +165,13 @@ public function load($filePath): void
     }
 
     /**
-     * @param $sql
+     * @param string $sql
      * @param null $expectedResults
      * @param null $params
      */
-    public function mock($sql, $expectedResults = null, $params = null): void
+    public function mock(string $sql, $expectedResults = null, $params = null): void
     {
-        $test = $this->mockedQueries->count();
         $this->mockedQueries->addQuery($sql, $params, $expectedResults);
-        $test = $this->mockedQueries->count();
-        $hell0 = 1;
     }
 
     /**

src/Pseudo/PdoStatement.php

@@ -223,7 +223,7 @@ public function setFetchMode($mode, $className = null, ...$params): bool|int
         $constants = $r->getConstants();
         $constantNames = array_keys($constants);
         $allowedConstantNames = array_filter($constantNames, function ($val) {
-            return strpos($val, 'FETCH_') === 0;
+            return str_starts_with($val, 'FETCH_');
         });
         $allowedConstantVals = [];
         foreach ($allowedConstantNames as $name) {
@@ -239,35 +239,35 @@ public function setFetchMode($mode, $className = null, ...$params): bool|int
 
     public function nextRowset(): bool
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function closeCursor(): bool
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function debugDumpParams(): ?bool
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
 
     // some functions make no sense when not actually talking to a database, so they are not implemented
 
     public function setAttribute($attribute, $value): bool
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function getAttribute($name): mixed
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function getColumnMeta($column): false|array
     {
-        // not implemented
+        throw new \RuntimeException('Not yet implemented');
     }
 
     public function getBoundParams(): array

src/Pseudo/QueryLog.php

@@ -2,9 +2,14 @@
 
 namespace Pseudo;
 
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
 use InvalidArgumentException;
+use IteratorAggregate;
+use Traversable;
 
-class QueryLog implements \IteratorAggregate, \ArrayAccess, \Countable
+class QueryLog implements IteratorAggregate, ArrayAccess, Countable
 {
     private $queries = [];
 
@@ -13,9 +18,9 @@ public function count(): int
         return count($this->queries);
     }
 
-    public function getIterator(): \Traversable
+    public function getIterator(): Traversable
     {
-        return new \ArrayIterator($this->queries);
+        return new ArrayIterator($this->queries);
     }
 
     public function offsetExists($offset): bool

src/Pseudo/ResultCollection.php

@@ -34,6 +34,9 @@ public function exists($sql): bool
         return isset($this->queries[$query->getHash()]);
     }
 
+    /**
+     * @throws Exception
+     */
     public function getResult(string|ParsedQuery $query): Result
     {
         if (!($query instanceof ParsedQuery)) {

src/php-sql-parser.php

@@ -2681,3 +2681,4 @@ public function getArgument()
 
     define('HAVE_PHP_SQL_PARSER', 1);
 }
+

tests/Unit/PdoTest.php

@@ -2,8 +2,8 @@
 namespace Pseudo\UnitTest;
 
 use PHPUnit\Framework\TestCase;
-use Pseudo\Exception;
 use Pseudo\Pdo;
+use Pseudo\Exception;
 use Pseudo\Result;
 use Pseudo\ResultCollection;
 
@@ -180,7 +180,7 @@ public function testSave()
         $this->assertEquals($r, $queries);
         unlink('testsave');
     }
-
+    
     public function testDebuggingRawQueries()
     {
         $message = null;