jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338147 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
9a00562 Use mediawiki cache for IP Velocity
3996eb5 Add recurring flag to PayPal Return URL
761f3ee Add argument to setGatewayDefaults base function
70d1a1a Add payment method to PayPal EC
3104b69 Update exchange rates
b2eb6b6 Fix a couple comments
Change-Id: I413405481974bc6907b0e114791222d2b5ecf4b9
---
D tests/phpunit/includes/test_gateway/TestingGenericAdapter.php
1 file changed, 0 insertions(+), 117 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/test_gateway/TestingGenericAdapter.php
b/tests/phpunit/includes/test_gateway/TestingGenericAdapter.php
deleted file mode 100644
index 7b5ba45..0000000
--- a/tests/phpunit/includes/test_gateway/TestingGenericAdapter.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<<<<<<< HEAD (8f77a9 Merge branch 'master' into deployment)
-=======
-<?php
-/**
- * Wikimedia Foundation
- *
- * LICENSE
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-/**
- * A really dumb adapter.
- */
-class TestingGenericAdapter extends GatewayAdapter {
-
- /**
- * A list of fake errors that is returned each time revalidate() is
called.
- */
- public $errorsForRevalidate = array();
-
- public $revalidateCount = 0;
- public static $fakeGlobals = array();
-
- public static $fakeIdentifier;
-
- public static $acceptedCurrencies = array();
-
- public function getCommunicationType() {
- return 'xml';
- }
-
- public function revalidate($check_not_empty = array()) {
- if ( !empty( $this->errorsForRevalidate ) ) {
- $fakeErrors =
$this->errorsForRevalidate[$this->revalidateCount];
- if ( $fakeErrors !== null ) {
- $this->revalidateCount++;
- $this->setValidationErrors( $fakeErrors );
- return empty( $fakeErrors );
- }
- }
- return parent::revalidate($check_not_empty);
- }
-
- public function normalizeOrderID( $override = null, $dataObj = null ) {
- return '12345';
- }
-
- public static function getGlobal( $name ) {
- if ( array_key_exists( $name,
TestingGenericAdapter::$fakeGlobals ) ) {
- return TestingGenericAdapter::$fakeGlobals[$name];
- }
- return parent::getGlobal( $name );
- }
-
- public static function getIdentifier() {
- if ( self::$fakeIdentifier ) {
- return self::$fakeIdentifier;
- }
- return GatewayAdapter::getIdentifier();
- }
-
- public function loadConfig() {
- }
-
- public function defineAccountInfo() {
- }
-
- public function defineDataConstraints() {
- }
-
- public function defineErrorMap() {
- }
-
- public function defineOrderIDMeta() {
- }
-
- public function definePaymentMethods() {
- }
-
- public function defineReturnValueMap() {
- }
-
- public function defineTransactions() {
- }
-
- public function defineDataTransformers() {
- $this->data_transformers = parent::getCoreDataTransformers();
- }
-
- public function defineVarMap() {
- }
-
- public function setGatewayDefaults( $options = array() ) {
- }
-
- public function getCurrencies( $options = array() ) {
- return TestingGenericAdapter::$acceptedCurrencies;
- }
-
- public function doPayment() {
- }
-
- protected function getBasedir() {
- return __DIR__;
- }
-}
->>>>>>> BRANCH (b2eb6b Fix a couple comments)
--
To view, visit https://gerrit.wikimedia.org/r/338147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I413405481974bc6907b0e114791222d2b5ecf4b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: deployment
Gerrit-Owner: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
