Ejegg has submitted this change and it was merged.
Change subject: Start a new branch for Drupal and embedding
......................................................................
Start a new branch for Drupal and embedding
This branch will be where we track deployment to Drupal. There are two
very minor (but unfortunate) code changes to maintain:
* Remove the MediaWiki version of WmfFramework, so that we can use
Composer's classmap compilation feature.
* Disable MediaWiki tests, since the above change is breaking.
Change-Id: Ia1dfbe8a0531d39e706f75fd5f7245cdd50bd55f
---
M .gitreview
M DonationInterface.php
D gateway_common/WmfFramework.mediawiki.php
3 files changed, 3 insertions(+), 73 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/.gitreview b/.gitreview
index 24d9ed1..fa3e872 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,5 @@
host=gerrit.wikimedia.org
port=29418
project=mediawiki/extensions/DonationInterface.git
-defaultbranch=master
+defaultbranch=drupal
defaultrebase=0
diff --git a/DonationInterface.php b/DonationInterface.php
index 140dfb1..de492f2 100644
--- a/DonationInterface.php
+++ b/DonationInterface.php
@@ -840,7 +840,8 @@
*/
//Unit tests
-$wgHooks['UnitTestsList'][] = 'efDonationInterfaceUnitTests';
+// MediaWiki tests are disabled for the Drupal branch.
+// $wgHooks['UnitTestsList'][] = 'efDonationInterfaceUnitTests';
//Stomp hooks
if ($optionalParts['Stomp'] === true){
diff --git a/gateway_common/WmfFramework.mediawiki.php
b/gateway_common/WmfFramework.mediawiki.php
deleted file mode 100644
index e0a1c75..0000000
--- a/gateway_common/WmfFramework.mediawiki.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-class WmfFramework {
- static function debugLog( $identifier, $msg ) {
- wfDebugLog( $identifier, $msg );
- }
-
- static function getIP() {
- global $wgRequest;
- return $wgRequest->getIP();
- }
-
- static function getHostname() {
- return wfHostname();
- }
-
- static function formatMessage($message_identifier /*, ... */ ) {
- return call_user_func_array( 'wfMessage', func_get_args()
)->text();
- }
-
- static function runHooks($func, $args) {
- return wfRunHooks($func, $args);
- }
-
- static function getLanguageCode() {
- global $wgLang;
- return $wgLang->getCode();
- }
-
- static function isUseSquid() {
- global $wgUseSquid;
- return $wgUseSquid;
- }
-
- static function setupSession($sessionId=false) {
- wfSetupSession();
- }
-
- static function validateIP($ip) {
- return IP::isValid( $ip );
- }
-
- static function isValidBuiltInLanguageCode( $code ) {
- return Language::isValidBuiltInCode( $code );
- }
-
- static function validateEmail( $email ) {
- return Sanitizer::validateEmail( $email );
- }
-
- /**
- * wmfMessageExists returns true if a translatable message has been
defined
- * for the string and language that have been passed in, false if none
is
- * present.
- * @param string $msg_key The message string to look up.
- * @param string $language A valid mediawiki language code.
- * @return boolean - true if message exists, otherwise false.
- */
- public static function messageExists( $msg_key, $language ) {
- return wfMessage( $msg_key )->inLanguage( $language )->exists();
- }
-
- static function getUserAgent() {
- return Http::userAgent();
- }
-
- static function isPosted() {
- global $wgRequest;
- $wgRequest->wasPosted();
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/165126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1dfbe8a0531d39e706f75fd5f7245cdd50bd55f
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: drupal
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
