Katie Horn has submitted this change and it was merged.
Change subject: Fixing Messages so We Don't Blow Up
......................................................................
Fixing Messages so We Don't Blow Up
Had some old stuff in here that would cause the system to not
recognize some IPN messages from Adyen. This patch will prevent
us from getting silly failmail when we don't need it.
Change-Id: Id464ee7143c17cc9496eaf5c31ab721ca764045e
---
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/AdyenMessage.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/Notificationtest.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderClosed.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderOpened.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundWithData.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundedReversed.php
M SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
7 files changed, 14 insertions(+), 79 deletions(-)
Approvals:
Katie Horn: Verified; Looks good to me, approved
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/AdyenMessage.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/AdyenMessage.php
index 6f3d6b4..0b31560 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/AdyenMessage.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/AdyenMessage.php
@@ -1,6 +1,7 @@
<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
use SmashPig\Core\Listeners\ListenerDataException;
+use SmashPig\Core\Logging\Logger;
use SmashPig\Core\Messages\ListenerMessage;
use SmashPig\PaymentProviders\Adyen\WSDL\NotificationRequestItem;
@@ -48,8 +49,10 @@
$className =
'SmashPig\\PaymentProviders\\Adyen\\ExpatriatedMessages\\' . $className;
if ( class_exists( $className ) ) {
+ Logger::debug( "Attempting construction of
'$className'" );
$obj = new $className();
} else {
+ Logger::debug( "Class not found '$className'" );
return false;
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/Notificationtest.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/Notificationtest.php
index 7af1124..efc3073 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/Notificationtest.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/Notificationtest.php
@@ -1,22 +1,7 @@
-<?php namespace SmashPig\PaymentProviders\Adyen\Messages;
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
use SmashPig\Core\Logging\Logger;
class Notificationtest extends AdyenMessage {
- /**
- * Determine if the message is complete, well formed, and able to be
- * processed. Returning true will continue processing of this message.
- * Returning false will halt processing of the message but will not be
- * treated as an error. Throw an exception if a critical error has
- * occurred.
- *
- * @return bool True if the message was complete and can be processed
- */
- public function validate() {
- // TODO: Implement validate() method.
- }
- public function runActionChain() {
- // TODO: Implement runActionChain() method.
- }
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderClosed.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderClosed.php
index 4cb0419..7ed64cd 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderClosed.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderClosed.php
@@ -1,23 +1,7 @@
-<?php namespace SmashPig\PaymentProviders\Adyen\Messages;
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
use SmashPig\Core\Logging\Logger;
class OrderClosed extends AdyenMessage {
- /**
- * Determine if the message is complete, well formed, and able to be
- * processed. Returning true will continue processing of this message.
- * Returning false will halt processing of the message but will not be
- * treated as an error. Throw an exception if a critical error has
- * occurred.
- *
- * @return bool True if the message was complete and can be processed
- */
- public function validate() {
- // TODO: Implement validate() method.
- }
-
- public function runActionChain() {
- // TODO: Implement runActionChain() method.
- }
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderOpened.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderOpened.php
index e0264fa..5d25c79 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderOpened.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/OrderOpened.php
@@ -1,22 +1,7 @@
-<?php namespace SmashPig\PaymentProviders\Adyen\Messages;
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
use SmashPig\Core\Logging\Logger;
class OrderOpened extends AdyenMessage {
- /**
- * Determine if the message is complete, well formed, and able to be
- * processed. Returning true will continue processing of this message.
- * Returning false will halt processing of the message but will not be
- * treated as an error. Throw an exception if a critical error has
- * occurred.
- *
- * @return bool True if the message was complete and can be processed
- */
- public function validate() {
- // TODO: Implement validate() method.
- }
- public function runActionChain() {
- // TODO: Implement runActionChain() method.
- }
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundWithData.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundWithData.php
index 804f3cf..bf572b4 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundWithData.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundWithData.php
@@ -1,12 +1,4 @@
-<?php
-/**
- * Created by JetBrains PhpStorm.
- * User: mwalker
- * Date: 1/10/13
- * Time: 4:14 PM
- * To change this template use File | Settings | File Templates.
- */
-class RefundWithData
-{
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
+class RefundWithData extends AdyenMessage {
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundedReversed.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundedReversed.php
index 9faa9dc..5e2ae45 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundedReversed.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/RefundedReversed.php
@@ -1,12 +1,5 @@
-<?php
-/**
- * Created by JetBrains PhpStorm.
- * User: mwalker
- * Date: 1/10/13
- * Time: 4:12 PM
- * To change this template use File | Settings | File Templates.
- */
-class RefundedReversed
-{
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
+
+class RefundedReversed extends AdyenMessage {
}
diff --git
a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
index 93cc012..98d8960 100644
--- a/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
+++ b/SmashPig/PaymentProviders/Adyen/ExpatriatedMessages/ReportAvailable.php
@@ -1,12 +1,5 @@
-<?php
-/**
- * Created by JetBrains PhpStorm.
- * User: mwalker
- * Date: 1/10/13
- * Time: 4:13 PM
- * To change this template use File | Settings | File Templates.
- */
-class ReportAvailable
-{
+<?php namespace SmashPig\PaymentProviders\Adyen\ExpatriatedMessages;
+
+class ReportAvailable extends AdyenMessage {
}
--
To view, visit https://gerrit.wikimedia.org/r/67554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id464ee7143c17cc9496eaf5c31ab721ca764045e
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/PaymentsListeners
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits