Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177704
Change subject: WIP include SmashPig through Composer
......................................................................
WIP include SmashPig through Composer
Change-Id: I38d9c6cc0fc31e6e624aab6e0abcc6255da112d0
---
M composer.json
M sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
2 files changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/04/177704/1
diff --git a/composer.json b/composer.json
index b76a461..ae4f7c3 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
"require": {
"cogpowered/finediff": "0.*",
"wikimedia/DonationInterface": "dev-drupal",
+ "wikimedia/SmashPig": "dev-master",
"fusesource/stomp-php": "2.*",
"phpmailer/phpmailer": "5.2.6",
"phpseclib/phpseclib": "0.3.7",
diff --git a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
index 447b318..8679c1b 100644
--- a/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
+++ b/sites/all/modules/wmf_audit/worldpay/worldpay_audit.module
@@ -7,6 +7,8 @@
define('WP_AUDIT_LOG_SEARCH_PAST_DAYS', 7);
define( 'WP_AUDIT_TEST_MODE', true );
+use SmashPig\PaymentProviders\WorldPay\Audit\WorldPayAudit;
+
/**
* Implementation of hook_menu()
*/
@@ -214,18 +216,8 @@
* @return mixed An array of recon data, or false
*/
function worldpay_audit_parse_recon_file($file) {
- static $parserClass = null;
- if (is_null($parserClass)) {
- $parser_directory = variable_get('worldpay_audit_recon_parser_dir',
WP_AUDIT_RECON_PARSER_DIR);
-
- //get the classes we need
- require_once( $parser_directory . 'WorldPayAudit.php' );
- require_once( $parser_directory . 'TransactionReconciliationFile.php' );
- $parserClass = 'SmashPig\PaymentProviders\WorldPay\Audit\WorldPayAudit';
//yeesh.
- }
-
$recon_data = array();
- $recon_parser = new $parserClass();
+ $recon_parser = new WorldPayAudit();
$data = null;
try {
--
To view, visit https://gerrit.wikimedia.org/r/177704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38d9c6cc0fc31e6e624aab6e0abcc6255da112d0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
