Katie Horn has submitted this change and it was merged.
Change subject: rename DonationData->gateway field to reflect new role
......................................................................
rename DonationData->gateway field to reflect new role
Change-Id: Ie804528f87200041ca29cad01122631e19b82de3
---
M gateway_common/DonationData.php
1 file changed, 7 insertions(+), 10 deletions(-)
Approvals:
Katie Horn: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/gateway_common/DonationData.php b/gateway_common/DonationData.php
index 53a6441..3d4314a 100644
--- a/gateway_common/DonationData.php
+++ b/gateway_common/DonationData.php
@@ -15,15 +15,12 @@
*/
class DonationData {
protected $normalized = array( );
- public $boss;
+ protected $gateway;
protected $validationErrors = null;
/**
* DonationData constructor
- * @param string $owning_class The name of the class that instantiated
this
- * instance of DonationData. This is used to grab gateway-specific
functions
- * and values, such as the logging function and gateway-specific global
- * variables.
+ * @param GatewayAdapter $gateway
* @param boolean $test Indicates if DonationData has been instantiated
in
* testing mode. Default is false.
* @param mixed $data An optional array of donation data that will, if
@@ -31,8 +28,8 @@
* places in $wgRequest, or 'false' to gather the data the usual way.
* Default is false.
*/
- function __construct( $owning_object, $test = false, $data = false ) {
- $this->boss = $owning_object;
+ function __construct( $gateway, $test = false, $data = false ) {
+ $this->gateway = $gateway;
$this->gatewayID = $this->getGatewayIdentifier();
$this->populateData( $test, $data );
}
@@ -693,7 +690,7 @@
// TODO: Move this somewhere more sane! We shouldn't be
doing anything with requests
// in normalization functions.
$id = $_GET['order_id'];
- } elseif ( $this->boss == 'AdyenAdapter' && array_key_exists(
'merchantReference', $_GET ) ) {
+ } elseif ( $this->getAdapterClass() == 'AdyenAdapter' &&
array_key_exists( 'merchantReference', $_GET ) ) {
$id = $_GET['merchantReference'];
} elseif ( ( $this->isSomething( 'order_id' ) ) && (
$idGenThisRequest == true ) ){
// An order ID already exists, therefore we do nothing
@@ -1370,7 +1367,7 @@
* @return mixed The name of the class if it exists, or false.
*/
protected function getAdapterClass(){
- return get_class( $this->boss );
+ return get_class( $this->gateway );
}
/**
@@ -1451,7 +1448,7 @@
*/
public function getValidationErrors( $recalculate = false,
$check_not_empty = array() ){
if ( is_null( $this->validationErrors ) || $recalculate ) {
- $this->validationErrors = DataValidator::validate(
$this->boss, $this->normalized, $check_not_empty );
+ $this->validationErrors = DataValidator::validate(
$this->gateway, $this->normalized, $check_not_empty );
}
return $this->validationErrors;
}
--
To view, visit https://gerrit.wikimedia.org/r/86717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie804528f87200041ca29cad01122631e19b82de3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
