Refactored special case for testing

lib/Database.php

@@ -14,17 +14,12 @@ class Database {
     public    $db;
     private   $driver;
 
-    public function __construct(Db\Driver $db = null) {
-        // if we're fed a pre-prepared driver, use it'
-        if($db) {
-            $this->db = $db;
-        } else {
-            $this->driver = $driver = Data::$conf->dbDriver;
-            $this->db = new $driver(INSTALL);
-            $ver = $this->db->schemaVersion();
-            if(!INSTALL && $ver < self::SCHEMA_VERSION) {
-                $this->db->schemaUpdate(self::SCHEMA_VERSION);
-            }
+    public function __construct() {
+        $this->driver = $driver = Data::$conf->dbDriver;
+        $this->db = new $driver(INSTALL);
+        $ver = $this->db->schemaVersion();
+        if(!INSTALL && $ver < self::SCHEMA_VERSION) {
+            $this->db->schemaUpdate(self::SCHEMA_VERSION);
         }
     }
 

tests/lib/Database.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+namespace JKingWeb\Arsse\Test;
+
+class Database extends \JKingWeb\Arsse\Database {
+    public function __construct(\JKingWeb\Arsse\Db\Driver $drv) {
+        $this->db = $drv;
+    }
+}

tests/lib/Database/Setup.php

@@ -5,7 +5,7 @@ use JKingWeb\Arsse\User\Driver as UserDriver;
 use JKingWeb\Arsse\Data;
 use JKingWeb\Arsse\Conf;
 use JKingWeb\Arsse\User;
-use JKingWeb\Arsse\Database;
+use JKingWeb\Arsse\Test\Database;
 use Phake;
 
 trait Setup {