Merge pull request #31 from tyrsson/patch-driver-and-driver-feature

tyrsson · web-flow · commit eece5b45989c · 2026-02-01T04:32:34.000-06:00
Aligns code with phpdb 0.6.0
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,11 +10,6 @@
          failOnDeprecation="true"
          failOnWarning="true">
 
-    <coverage pathCoverage="true">
-        <report>
-            <html outputDirectory="test/coverage/html"/>
-        </report>
-    </coverage>
     <testsuites>
         <testsuite name="unit test">
             <directory>./test/unit</directory>
diff --git a/src/Pdo/Driver.php b/src/Pdo/Driver.php
@@ -29,7 +29,7 @@ public function createResult($resource, Statement|string|null $context = null):
         $result = clone $this->resultPrototype;
         /** @var Feature\SqliteRowCounter $sqliteRowCounter */
         $sqliteRowCounter = $this->getFeature(Feature\SqliteRowCounter::class);
-        $rowCount         = null;
+        $rowCount         = 0;
 
         if ($sqliteRowCounter && $resource->columnCount() > 0) {
             $rowCount = $sqliteRowCounter->getRowCountClosure($context);
diff --git a/src/Pdo/Feature/SqliteRowCounter.php b/src/Pdo/Feature/SqliteRowCounter.php
@@ -9,46 +9,47 @@
 use PhpDb\Adapter\Driver\Pdo;
 use PhpDb\Adapter\Driver\Pdo\Statement;
 
-use function stripos;
+use function str_contains;
+use function strtolower;
 
 /**
  * SqliteRowCounter
  */
 class SqliteRowCounter extends AbstractFeature
 {
-    public function getCountForStatement(Pdo\Statement $statement): ?int
+    public function getCountForStatement(Pdo\Statement $statement): int
     {
         $countStmt = clone $statement;
         $sql       = $statement->getSql();
-        if ($sql === '' || $sql === null || stripos($sql, 'select') === false) {
-            return null;
+        if (empty($sql) || ! str_contains(strtolower($sql), 'select')) {
+            return 0;
         }
         $countSql = 'SELECT COUNT(*) as "count" FROM (' . $sql . ')';
         $countStmt->prepare($countSql);
         $result   = $countStmt->execute();
         $countRow = $result->getResource()->fetch(\PDO::FETCH_ASSOC);
         unset($statement, $result);
 
-        return $countRow['count'];
+        return (int) $countRow['count'];
     }
 
-    public function getCountForSql(string $sql): ?int
+    public function getCountForSql(string $sql): int
     {
-        if (stripos($sql, 'select') === false) {
-            return null;
+        if (empty($sql) || ! str_contains(strtolower($sql), 'select')) {
+            return 0;
         }
         $countSql = 'SELECT COUNT(*) as count FROM (' . $sql . ')';
         /** @var \PDO $pdo */
         $pdo      = $this->driver->getConnection()->getResource();
         $result   = $pdo->query($countSql);
         $countRow = $result->fetch(\PDO::FETCH_ASSOC);
 
-        return $countRow['count'];
+        return (int) $countRow['count'];
     }
 
     public function getRowCountClosure(Statement|string|null $context): Closure
     {
-        return function () use ($context) {
+        return function () use ($context): int {
             return $context instanceof Pdo\Statement
                 ? $this->getCountForStatement($context)
                 : $this->getCountForSql($context);
