[MediaWiki-commits] [Gerrit] Finish fixing drush parse-audit - change (wikimedia...crm)

2015-07-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Finish fixing drush parse-audit
..


Finish fixing drush parse-audit

D'oh!  Didn't quite get it right last night.

Bug: T90507
Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
---
M sites/all/modules/wmf_audit/wmf_audit.drush.inc
M sites/all/modules/wmf_audit/wmf_audit.module
2 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  Cdentinger: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/sites/all/modules/wmf_audit/wmf_audit.drush.inc 
b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
index b9a221a..8248458 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.drush.inc
+++ b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
@@ -51,10 +51,7 @@
 function drush_wmf_audit_parse_audit() {
 
   $args = drush_get_arguments();
-  if ( count( $args ) !== 2 ) {
-throw new WmfException( "{$args[0]} requires a gateway." );
-  }
-  $gateway = $args[1];
+  $gateway = $args[1]; // required-arguments should ensure this exists
 
   $simple_opts = array(
 'test' => 'Running in test mode: No stomp messages will be sent',
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module 
b/sites/all/modules/wmf_audit/wmf_audit.module
index 4711d96..0ef8a7d 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -34,9 +34,9 @@
  * @param array $options Runtime parameters
  */
 function wmf_audit_main( $gateway, $options ) {
-$audit = module_hook_invoke( "{$gateway}_audit", 'create_processor', 
$options );
+$audit = module_invoke( "{$gateway}_audit", 'create_processor', $options );
 if ( !$audit ) {
-   throw new Exception( "Gateway [$gateway] not found" );
+throw new Exception( "Gateway [$gateway] not found" );
 }
 $audit->run();
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/224845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Finish fixing drush parse-audit - change (wikimedia...crm)

2015-07-15 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/224845

Change subject: Finish fixing drush parse-audit
..

Finish fixing drush parse-audit

D'oh!  Didn't quite get it right last night.

Bug: T90507
Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
---
M sites/all/modules/wmf_audit/wmf_audit.drush.inc
M sites/all/modules/wmf_audit/wmf_audit.module
2 files changed, 3 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/45/224845/1

diff --git a/sites/all/modules/wmf_audit/wmf_audit.drush.inc 
b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
index b9a221a..8248458 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.drush.inc
+++ b/sites/all/modules/wmf_audit/wmf_audit.drush.inc
@@ -51,10 +51,7 @@
 function drush_wmf_audit_parse_audit() {
 
   $args = drush_get_arguments();
-  if ( count( $args ) !== 2 ) {
-throw new WmfException( "{$args[0]} requires a gateway." );
-  }
-  $gateway = $args[1];
+  $gateway = $args[1]; // required-arguments should ensure this exists
 
   $simple_opts = array(
 'test' => 'Running in test mode: No stomp messages will be sent',
diff --git a/sites/all/modules/wmf_audit/wmf_audit.module 
b/sites/all/modules/wmf_audit/wmf_audit.module
index 4711d96..0ef8a7d 100644
--- a/sites/all/modules/wmf_audit/wmf_audit.module
+++ b/sites/all/modules/wmf_audit/wmf_audit.module
@@ -34,9 +34,9 @@
  * @param array $options Runtime parameters
  */
 function wmf_audit_main( $gateway, $options ) {
-$audit = module_hook_invoke( "{$gateway}_audit", 'create_processor', 
$options );
+$audit = module_invoke( "{$gateway}_audit", 'create_processor', $options );
 if ( !$audit ) {
-   throw new Exception( "Gateway [$gateway] not found" );
+throw new Exception( "Gateway [$gateway] not found" );
 }
 $audit->run();
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/224845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iecc14cd873327338937c47c7097a42c406d9140a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits