fix: tests run now with pdo_sqlite

Author: thorsten

phpmyfaq/src/phpMyFAQ/Configuration.php

@@ -435,7 +435,7 @@ public function add(string $name, mixed $value): bool
     {
         if (!isset($this->config[$name])) {
             $insert = sprintf(
-                "INSERT INTO %s%s VALUES ('%s', '%s')",
+                "INSERT INTO %s%s (config_name, config_value) VALUES ('%s', '%s')",
                 Database::getTablePrefix(),
                 $this->tableName,
                 $this->getDb()->escape(trim($name)),

phpmyfaq/src/phpMyFAQ/Database/PdoSqlite.php

@@ -81,18 +81,24 @@ public function error(): string
 
     /**
      * Escapes a string for use in a query.
+     *
+     * Note: Unlike PDO::quote(), this method intentionally does NOT add surrounding quotes.
+     * It mirrors the behavior of other drivers (e.g., Sqlite3::escapeString), returning
+     * only the escaped content so callers can uniformly wrap values in SQL strings.
      */
     public function escape(string $string): string
     {
-        return $this->pdo->quote($string);
+        // For SQLite, escaping single quotes by doubling them is enough.
+        return str_replace("'", "''", $string);
     }
 
     /**
      * Fetch a result row as an associative array.
      */
     public function fetchArray(mixed $result): ?array
     {
-        return $result->fetch(PDO::FETCH_ASSOC);
+        $row = $result->fetch(PDO::FETCH_ASSOC);
+        return $row === false || $row === null ? null : $row;
     }
 
     /**
@@ -126,15 +132,37 @@ public function fetchAll(mixed $result): ?array
      */
     public function fetchObject(mixed $result): mixed
     {
-        return $result->fetch(PDO::FETCH_OBJ);
+        $obj = $result->fetch(PDO::FETCH_OBJ);
+        return $obj === false ? null : $obj;
     }
 
     /**
      * Number of rows in a result.
      */
     public function numRows(mixed $result): int
     {
-        return $result->rowCount();
+        try {
+            $sql = $result->queryString ?? '';
+            if (is_string($sql) && $sql !== '' && preg_match('/^\s*SELECT\b/i', $sql) === 1) {
+                $inner = rtrim($sql, " \t\n\r\0\x0B;");
+                $countSql = 'SELECT COUNT(*) AS c FROM (' . $inner . ') AS _pmf_cnt';
+                $stmt = $this->pdo->query($countSql);
+                if ($stmt === false) {
+                    return 0;
+                }
+                $row = $stmt->fetch(PDO::FETCH_NUM);
+                return isset($row[0]) ? (int) $row[0] : 0;
+            }
+        } catch (\Throwable) {
+            // ignore
+        }
+
+        // Fallback: for non-SELECT statements rely on rowCount (INSERT/UPDATE/DELETE)
+        try {
+            return (int) $result->rowCount();
+        } catch (\Throwable) {
+            return 0;
+        }
     }
 
     /**

tests/bootstrap.php

@@ -71,7 +71,7 @@
 //
 $setup = [
     'dbServer' => PMF_TEST_DIR . '/test.db',
-    'dbType' => 'sqlite3',
+    'dbType' => 'pdo_sqlite',
     'dbPort' => null,
     'dbDatabaseName' => '',
     'loginname' => 'admin',

tests/phpMyFAQ/Configuration/DatabaseConfigurationTest.php

@@ -16,6 +16,6 @@ public function testDBConfigProperties(): void
         $this->assertEquals('', $config->getPassword());
         $this->assertEquals('', $config->getDatabase());
         $this->assertEquals('', $config->getPrefix());
-        $this->assertEquals('sqlite3', $config->getType());
+        $this->assertEquals('pdo_sqlite', $config->getType());
     }
 }

tests/phpMyFAQ/ConfigurationTest.php

@@ -16,7 +16,7 @@
 class ConfigurationTest extends TestCase
 {
     /** @var Configuration */
-    private $configuration;
+    private Configuration $configuration;
 
     /**
      * Prepares the environment before running a test.
@@ -74,7 +74,6 @@ private function setupTestDatabase(): void
      */
     protected function tearDown(): void
     {
-        $this->configuration = null;
         parent::tearDown();
     }
 

tests/phpMyFAQ/RelationTest.php

@@ -3,15 +3,15 @@
 namespace phpMyFAQ;
 
 use phpMyFAQ\Configuration\DatabaseConfiguration;
-use phpMyFAQ\Database\Sqlite3;
+use phpMyFAQ\Database\PdoSqlite;use phpMyFAQ\Database\Sqlite3;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 class RelationTest extends TestCase
 {
-    private Sqlite3 $db;
+    private PdoSqlite $db;
 
     protected function tearDown(): void
     {

tests/phpMyFAQ/Search/SearchFactoryTest.php

@@ -16,7 +16,7 @@
 class SearchFactoryTest extends TestCase
 {
     /** @var Configuration */
-    private Configuration $configuration;
+    private $configuration;
 
     /**
      * Prepares the environment before running a test.
@@ -54,6 +54,6 @@ public function testCreate(): void
     {
         $search = SearchFactory::create($this->configuration, array('database' => Database::getType()));
 
-        $this->assertInstanceOf('phpMyFAQ\Search\Database\Sqlite3', $search);
+        $this->assertInstanceOf('phpMyFAQ\Search\Database\PdoSqlite', $search);
     }
 }

tests/phpMyFAQ/SitemapTest.php

@@ -3,7 +3,7 @@
 namespace phpMyFAQ;
 
 use phpMyFAQ\Configuration\DatabaseConfiguration;
-use phpMyFAQ\Database\Sqlite3;
+use phpMyFAQ\Database\PdoSqlite;use phpMyFAQ\Database\Sqlite3;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\TestCase;
 use stdClass;
@@ -13,7 +13,7 @@ class SitemapTest extends TestCase
 {
     private Sitemap $sitemap;
 
-    private Sqlite3 $db;
+    private PdoSqlite $db;
 
     /**
      * @throws Exception