From be7b10166a55fb58652ae5cd5aa6e099c8761e8b Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 14 May 2013 21:13:02 -0700 Subject: [PATCH] Made DatabaseBase::getSoftwareLink() dynamic. * All callers are calling it this way and it breaks hhvm when declared statically and called dynamically. Change-Id: I894e615fd828615384aa8457a16a759c8aa416ef --- includes/db/Database.php | 2 +- includes/db/DatabaseMssql.php | 2 +- includes/db/DatabaseMysql.php | 2 +- includes/db/DatabaseOracle.php | 2 +- includes/db/DatabasePostgres.php | 2 +- includes/db/DatabaseSqlite.php | 2 +- tests/phpunit/includes/db/DatabaseTestHelper.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 85c459eef0..09866dca5d 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -184,7 +184,7 @@ interface DatabaseType { * * @return string: wikitext of a link to the server software's web site */ - static function getSoftwareLink(); + function getSoftwareLink(); /** * A string describing the current software version, like from diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 130ac70537..240a097ce2 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -654,7 +654,7 @@ class DatabaseMssql extends DatabaseBase { /** * @return string wikitext of a link to the server software's web site */ - public static function getSoftwareLink() { + public function getSoftwareLink() { return "[http://www.microsoft.com/sql/ MS SQL Server]"; } diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php index d8a3723a4b..ca5a2b4cbf 100644 --- a/includes/db/DatabaseMysql.php +++ b/includes/db/DatabaseMysql.php @@ -671,7 +671,7 @@ class DatabaseMysql extends DatabaseBase { /** * @return string */ - public static function getSoftwareLink() { + public function getSoftwareLink() { return '[http://www.mysql.com/ MySQL]'; } diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index c197d91b1d..4fa2397c2c 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -837,7 +837,7 @@ class DatabaseOracle extends DatabaseBase { /** * @return string wikitext of a link to the server software's web site */ - public static function getSoftwareLink() { + public function getSoftwareLink() { return '[http://www.oracle.com/ Oracle]'; } diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index b5ac5cb4ca..367335e154 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -1059,7 +1059,7 @@ __INDEXATTR__; /** * @return string wikitext of a link to the server software's web site */ - public static function getSoftwareLink() { + public function getSoftwareLink() { return '[http://www.postgresql.org/ PostgreSQL]'; } diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index 53a4dcfb91..ed6c8481b1 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -612,7 +612,7 @@ class DatabaseSqlite extends DatabaseBase { /** * @return string wikitext of a link to the server software's web site */ - public static function getSoftwareLink() { + public function getSoftwareLink() { return "[http://sqlite.org/ SQLite]"; } diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php index 57df08ec3e..790f273c2d 100644 --- a/tests/phpunit/includes/db/DatabaseTestHelper.php +++ b/tests/phpunit/includes/db/DatabaseTestHelper.php @@ -144,7 +144,7 @@ class DatabaseTestHelper extends DatabaseBase { return -1; } - static function getSoftwareLink() { + function getSoftwareLink() { return 'test'; } -- 2.20.1