mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 17:44:07 +02:00
Code Issues Releases Wiki Activity

uses PHP 5 constructors

Browse Source
This commit is contained in:
David Grudl
2015-08-15 17:04:21 +02:00
committed by Jakub Vrana
parent d1aa3542ae
commit a6ebd4a3e0
25 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/elastic.inc.php
View File

@@ -81,7 +81,7 @@ if (isset($_GET["elastic"])) {
class Min_Result {
var $num_rows, $_rows;
function Min_Result($rows) {
function __construct($rows) {
$this->num_rows = count($this->_rows);
$this->_rows = $rows;
reset($this->_rows);

2
adminer/drivers/firebird.inc.php
View File

@@ -81,7 +81,7 @@ if (isset($_GET["firebird"])) {
class Min_Result {
var $num_rows, $_result, $_offset = 0;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
// $this->num_rows = ibase_num_rows($result);
}

2
adminer/drivers/mongo.inc.php
View File

@@ -52,7 +52,7 @@ if (isset($_GET["mongo"])) {
class Min_Result {
var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
function Min_Result($result) {
function __construct($result) {
foreach ($result as $item) {
$row = array();
foreach ($item as $key => $val) {

4
adminer/drivers/mssql.inc.php
View File

@@ -93,7 +93,7 @@ if (isset($_GET["mssql"])) {
class Min_Result {
var $_result, $_offset = 0, $_fields, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
// $this->num_rows = sqlsrv_num_rows($result); // available only in scrollable results
}
@@ -201,7 +201,7 @@ if (isset($_GET["mssql"])) {
class Min_Result {
var $_result, $_offset = 0, $_fields, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
$this->num_rows = mssql_num_rows($result);
}

4
adminer/drivers/mysql.inc.php
View File

@@ -9,7 +9,7 @@ if (!defined("DRIVER")) {
class Min_DB extends MySQLi {
var $extension = "MySQLi";
function Min_DB() {
function __construct() {
parent::init();
}
@@ -181,7 +181,7 @@ if (!defined("DRIVER")) {
/** Constructor
* @param resource
*/
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
$this->num_rows = mysql_num_rows($result);
}

2
adminer/drivers/oracle.inc.php
View File

@@ -80,7 +80,7 @@ if (isset($_GET["oracle"])) {
class Min_Result {
var $_result, $_offset = 1, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
}

2
adminer/drivers/pgsql.inc.php
View File

@@ -94,7 +94,7 @@ if (isset($_GET["pgsql"])) {
class Min_Result {
var $_result, $_offset = 0, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
$this->num_rows = pg_num_rows($result);
}

2
adminer/drivers/simpledb.inc.php
View File

@@ -56,7 +56,7 @@ if (isset($_GET["simpledb"])) {
class Min_Result {
var $num_rows, $_rows = array(), $_offset = 0;
function Min_Result($result) {
function __construct($result) {
foreach ($result as $item) {
$row = array();
if ($item->Name != '') { // SELECT COUNT(*)

20
adminer/drivers/sqlite.inc.php
View File

@@ -11,7 +11,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
class Min_SQLite {
var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
function Min_SQLite($filename) {
function __construct($filename) {
$this->_link = new SQLite3($filename);
$version = $this->_link->version();
$this->server_info = $version["versionString"];
@@ -55,7 +55,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
class Min_Result {
var $_result, $_offset = 0, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
}
@@ -87,7 +87,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
class Min_SQLite {
var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
function Min_SQLite($filename) {
function __construct($filename) {
$this->server_info = sqlite_libversion();
$this->_link = new SQLiteDatabase($filename);
}
@@ -127,7 +127,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
class Min_Result {
var $_result, $_offset = 0, $num_rows;
function Min_Result($result) {
function __construct($result) {
$this->_result = $result;
if (method_exists($result, 'numRows')) { // not available in unbuffered query
$this->num_rows = $result->numRows();
@@ -172,7 +172,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
class Min_SQLite extends Min_PDO {
var $extension = "PDO_SQLite";
function Min_SQLite($filename) {
function __construct($filename) {
$this->dsn(DRIVER . ":$filename", "", "");
}
}
@@ -182,13 +182,13 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
if (class_exists("Min_SQLite")) {
class Min_DB extends Min_SQLite {
function Min_DB() {
$this->Min_SQLite(":memory:");
function __construct() {
parent::__construct(":memory:");
}
function select_db($filename) {
if (is_readable($filename) && $this->query("ATTACH " . $this->quote(preg_match("~(^[/\\\\]|:)~", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
$this->Min_SQLite($filename);
parent::__construct($filename);
return true;
}
return false;
@@ -440,7 +440,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
function drop_databases($databases) {
global $connection;
$connection->Min_SQLite(":memory:"); // to unlock file, doesn't work in PDO on Windows
$connection->__construct(":memory:"); // to unlock file, doesn't work in PDO on Windows
foreach ($databases as $db) {
if (!@unlink($db)) {
$connection->error = lang('File exists.');
@@ -455,7 +455,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
if (!check_sqlite_name($name)) {
return false;
}
$connection->Min_SQLite(":memory:");
$connection->__construct(":memory:");
$connection->error = lang('File exists.');
return @rename(DB, $name);
}