Revert "Merge tag 'v2.10.6'"

This reverts commit 122ea4ab9e, reversing
changes made to c54a11e250.

core/dbengine.php

@@ -16,7 +16,7 @@ abstract class DBEngine
 {
     public DatabaseDriverID $id;
 
-    public function init(PDO $db): void
+    public function init(PDO $db)
     {
     }
 
@@ -30,18 +30,18 @@ abstract class DBEngine
         return 'CREATE TABLE '.$name.' ('.$data.')';
     }
 
-    abstract public function set_timeout(PDO $db, ?int $time): void;
+    abstract public function set_timeout(PDO $db, ?int $time);
 
     abstract public function get_version(PDO $db): string;
 
-    abstract public function notify(PDO $db, string $channel, ?string $data = null): void;
+    abstract public function notify(PDO $db, string $channel, ?string $data=null): void;
 }
 
 class MySQL extends DBEngine
 {
     public DatabaseDriverID $id = DatabaseDriverID::MYSQL;
 
-    public function init(PDO $db): void
+    public function init(PDO $db)
     {
         $db->exec("SET NAMES utf8;");
     }
@@ -66,13 +66,13 @@ class MySQL extends DBEngine
         // $db->exec("SET SESSION MAX_EXECUTION_TIME=".$time.";");
     }
 
-    public function notify(PDO $db, string $channel, ?string $data = null): void
+    public function notify(PDO $db, string $channel, ?string $data=null): void
     {
     }
 
     public function get_version(PDO $db): string
     {
-        return false_throws($db->query('select version()'))->fetch()[0];
+        return $db->query('select version()')->fetch()[0];
     }
 }
 
@@ -80,7 +80,7 @@ class PostgreSQL extends DBEngine
 {
     public DatabaseDriverID $id = DatabaseDriverID::PGSQL;
 
-    public function init(PDO $db): void
+    public function init(PDO $db)
     {
         if (array_key_exists('REMOTE_ADDR', $_SERVER)) {
             $db->exec("SET application_name TO 'shimmie [{$_SERVER['REMOTE_ADDR']}]';");
@@ -113,7 +113,7 @@ class PostgreSQL extends DBEngine
         $db->exec("SET statement_timeout TO ".$time.";");
     }
 
-    public function notify(PDO $db, string $channel, ?string $data = null): void
+    public function notify(PDO $db, string $channel, ?string $data=null): void
     {
         if ($data) {
             $db->exec("NOTIFY $channel, '$data';");
@@ -124,44 +124,44 @@ class PostgreSQL extends DBEngine
 
     public function get_version(PDO $db): string
     {
-        return false_throws($db->query('select version()'))->fetch()[0];
+        return $db->query('select version()')->fetch()[0];
     }
 }
 
 // shimmie functions for export to sqlite
-function _unix_timestamp(string $date): int
+function _unix_timestamp($date): int
 {
-    return strtotime_ex($date);
+    return strtotime($date);
 }
 function _now(): string
 {
     return date("Y-m-d H:i:s");
 }
-function _floor(float|int $a): float
+function _floor($a): float
 {
     return floor($a);
 }
-function _log(float $a, ?float $b = null): float
+function _log($a, $b=null): float
 {
     if (is_null($b)) {
         return log($a);
     } else {
-        return log($b, $a);
+        return log($a, $b);
     }
 }
-function _isnull(mixed $a): bool
+function _isnull($a): bool
 {
     return is_null($a);
 }
-function _md5(string $a): string
+function _md5($a): string
 {
     return md5($a);
 }
-function _concat(string $a, string $b): string
+function _concat($a, $b): string
 {
     return $a . $b;
 }
-function _lower(string $a): string
+function _lower($a): string
 {
     return strtolower($a);
 }
@@ -169,7 +169,7 @@ function _rand(): int
 {
     return rand();
 }
-function _ln(float $n): float
+function _ln($n): float
 {
     return log($n);
 }
@@ -178,7 +178,7 @@ class SQLite extends DBEngine
 {
     public DatabaseDriverID $id = DatabaseDriverID::SQLITE;
 
-    public function init(PDO $db): void
+    public function init(PDO $db)
     {
         ini_set('sqlite.assoc_case', '0');
         $db->exec("PRAGMA foreign_keys = ON;");
@@ -225,12 +225,12 @@ class SQLite extends DBEngine
         // There doesn't seem to be such a thing for SQLite, so it does nothing
     }
 
-    public function notify(PDO $db, string $channel, ?string $data = null): void
+    public function notify(PDO $db, string $channel, ?string $data=null): void
     {
     }
 
     public function get_version(PDO $db): string
     {
-        return false_throws($db->query('select sqlite_version()'))->fetch()[0];
+        return $db->query('select sqlite_version()')->fetch()[0];
     }
 }