jenkins-bot has submitted this change and it was merged.
Change subject: Made DatabaseBase::getSoftwareLink() dynamic.
......................................................................
Made DatabaseBase::getSoftwareLink() dynamic.
* All callers are calling it this way and it breaks
hhvm when declared statically and called dynamically.
Change-Id: I894e615fd828615384aa8457a16a759c8aa416ef
---
M includes/db/Database.php
M includes/db/DatabaseMssql.php
M includes/db/DatabaseMysql.php
M includes/db/DatabaseOracle.php
M includes/db/DatabasePostgres.php
M includes/db/DatabaseSqlite.php
M tests/phpunit/includes/db/DatabaseTestHelper.php
7 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
MaxSem: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 85c459e..09866dc 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -184,7 +184,7 @@
*
* @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 130ac70..240a097 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -654,7 +654,7 @@
/**
* @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 d8a3723..ca5a2b4 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -671,7 +671,7 @@
/**
* @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 c197d91..4fa2397 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -837,7 +837,7 @@
/**
* @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 b5ac5cb..367335e 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -1059,7 +1059,7 @@
/**
* @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 53a4dcf..ed6c848 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -612,7 +612,7 @@
/**
* @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 57df08e..790f273 100644
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -144,7 +144,7 @@
return -1;
}
- static function getSoftwareLink() {
+ function getSoftwareLink() {
return 'test';
}
--
To view, visit https://gerrit.wikimedia.org/r/63824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I894e615fd828615384aa8457a16a759c8aa416ef
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Liangent <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
