Fix type of select_db()

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index c16a0c13cf5ef49626f28255428b191c1ff6f0e5..8c5d896bbbcbc53f9466c1d0f29ef37a7884b268 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -53,7 +53,7 @@ if (isset($_GET["mssql"])) {
                                return ($unicode ? "N" : "") . "'" . str_replace("'", "''", $string) . "'";
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return $this->query(use_sql($database));
                        }
 
@@ -159,7 +159,7 @@ if (isset($_GET["mssql"])) {
 
        } else {
                abstract class MssqlDb extends PdoDb {
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                // database selection is separated from the connection so dbname in DSN can't be used
                                return $this->query(use_sql($database));
                        }

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 2c74db95390a84acaee089777accdd0b08fa6cb5..b619d79101263d199459e2a38acdd05cb76a83a9 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -91,7 +91,7 @@ if (!defined('Adminer\DRIVER')) {
                                return "'" . mysql_real_escape_string($string, $this->link) . "'";
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return mysql_select_db($database, $this->link);
                        }
 
@@ -186,7 +186,7 @@ if (!defined('Adminer\DRIVER')) {
                                return $this->query("SET NAMES $charset"); // charset in DSN is ignored before PHP 5.3.6
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                // database selection is separated from the connection so dbname in DSN can't be used
                                return $this->query("USE " . idf_escape($database));
                        }

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index 7ec8d4ae47eb74435578d4f6d229e51abcaae747..0bbd9f4dbf286663d4c6dfd74218eaef9bbe7706 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -33,7 +33,7 @@ if (isset($_GET["oracle"])) {
                                return "'" . str_replace("'", "''", $string) . "'";
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                $this->_current_db = $database;
                                return true;
                        }
@@ -109,7 +109,7 @@ if (isset($_GET["oracle"])) {
                                return $this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                $this->_current_db = $database;
                                return true;
                        }

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 5c9b0f8b3f2f26f426e6a61c31fbeb45bc53b5de..478519ae2857a5fce4fe364ceafc4689ece7a382 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -51,7 +51,7 @@ if (isset($_GET["pgsql"])) {
                                return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                if ($database == adminer()->database()) {
                                        return $this->database;
                                }
@@ -138,7 +138,7 @@ if (isset($_GET["pgsql"])) {
                                return $this->dsn($dsn, $username, $password);
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return (adminer()->database() == $database);
                        }
 

diff --git a/adminer/include/db.inc.php b/adminer/include/db.inc.php
index 464fe3a743d483975853c5220aa2ef68efde06d8..93800e4fcce0ea7dd1fabb38e84847c49b146221 100644 (file)
--- a/adminer/include/db.inc.php
+++ b/adminer/include/db.inc.php
@@ -25,8 +25,10 @@ abstract class SqlDb {
        */
        abstract function quote(string $string): string;
 
-       /** Select database */
-       abstract function select_db(string $database): bool;
+       /** Select database
+       * @return bool boolish
+       */
+       abstract function select_db(string $database);
 
        /** Send query
        * @return Result|bool

diff --git a/plugins/drivers/clickhouse.php b/plugins/drivers/clickhouse.php
index eae90dd6911a4346a1dd421dd2c445790f87cac8..78c4782c9f641042552902712e78ff4477a2fd96 100644 (file)
--- a/plugins/drivers/clickhouse.php
+++ b/plugins/drivers/clickhouse.php
@@ -63,7 +63,7 @@ if (isset($_GET["clickhouse"])) {
                                return ($return ? '' : $this->error);
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                $this->_db = $database;
                                return true;
                        }

diff --git a/plugins/drivers/elastic.php b/plugins/drivers/elastic.php
index b22af2cdd11f7e5b62a46056d9e28f594b29c85b..7f2c5513975992f479daa1d3d919999492cc6ff1 100644 (file)
--- a/plugins/drivers/elastic.php
+++ b/plugins/drivers/elastic.php
@@ -71,7 +71,7 @@ if (isset($_GET["elastic"])) {
                                return ($return ? '' : $this->error);
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return true;
                        }
 

diff --git a/plugins/drivers/firebird.php b/plugins/drivers/firebird.php
index d81bbd94d95ef61d78106dd4025534e16b58b2ae..119fb10e81cd07a7e8aac3e7a395a36da732abac 100644 (file)
--- a/plugins/drivers/firebird.php
+++ b/plugins/drivers/firebird.php
@@ -29,7 +29,7 @@ if (isset($_GET["firebird"])) {
                                return "'" . str_replace("'", "''", $string) . "'";
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return ($database == "domain");
                        }
 

diff --git a/plugins/drivers/imap.php b/plugins/drivers/imap.php
index 29583057c6aa9b3c02f7041fb698c32e30de810a..37246f32caea188db67657d1a37c706401a43536 100644 (file)
--- a/plugins/drivers/imap.php
+++ b/plugins/drivers/imap.php
@@ -30,7 +30,7 @@ if (isset($_GET["imap"])) {
                                return ($this->imap ? '' : imap_last_error());
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return ($database == "mail");
                        }
 

diff --git a/plugins/drivers/mongo.php b/plugins/drivers/mongo.php
index ae50ac81a0ab84366ee281e4ec9ae2128649d027..174993e17c65f38a578ee23b32000136f6a4fc24 100644 (file)
--- a/plugins/drivers/mongo.php
+++ b/plugins/drivers/mongo.php
@@ -58,7 +58,7 @@ if (isset($_GET["mongo"])) {
                                return false;
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                $this->_db_name = $database;
                                return true;
                        }

diff --git a/plugins/drivers/simpledb.php b/plugins/drivers/simpledb.php
index 52f558be8a2dd17eede19f184ea3575c1e2a4752..ff46ff19b19e52e6cb3fbfc2fc24f1e8bfbf2bc5 100644 (file)
--- a/plugins/drivers/simpledb.php
+++ b/plugins/drivers/simpledb.php
@@ -14,7 +14,7 @@ if (isset($_GET["simpledb"])) {
                                return '';
                        }
 
-                       function select_db(string $database): bool {
+                       function select_db(string $database) {
                                return ($database == "domain");
                        }