File tree Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Original file line number Diff line number Diff line change 22
33namespace Omnipay \EPays \Message \MyCash ;
44
5- use Omnipay \Common \Exception \InvalidResponseException ;
5+ use Omnipay \Common \Exception \InvalidRequestException ;
66use Omnipay \Common \Message \AbstractRequest ;
77use Omnipay \EPays \Traits \MyCash \HasMyCash ;
88
@@ -13,15 +13,13 @@ class CompletePurchaseRequest extends AbstractRequest
1313 /**
1414 * @return array
1515 *
16- * @throws InvalidResponseException
16+ * @throws InvalidRequestException
1717 */
1818 public function getData ()
1919 {
2020 $ data = $ this ->httpRequest ->request ->all ();
21- $ validate = array_key_exists ('Validate ' , $ data ) ? $ data ['Validate ' ] : '' ;
22-
23- if ($ this ->makeHash ($ data ) !== $ validate ) {
24- throw new InvalidResponseException ('Incorrect hash ' );
21+ if (! hash_equals ($ this ->makeHash ($ data ), $ this ->httpRequest ->request ->get ('Validate ' ))) {
22+ throw new InvalidRequestException ('Incorrect hash ' );
2523 }
2624
2725 return $ data ;
Original file line number Diff line number Diff line change @@ -18,8 +18,7 @@ class GetPaymentInfoRequest extends AbstractRequest
1818 public function getData ()
1919 {
2020 $ data = $ this ->httpRequest ->request ->all ();
21-
22- if (! hash_equals ($ this ->httpRequest ->request ->get ('Validate ' ), $ this ->makeHash ($ data ))) {
21+ if (! hash_equals ($ this ->makeHash ($ data ), $ this ->httpRequest ->request ->get ('Validate ' ))) {
2322 throw new InvalidResponseException ('Incorrect hash ' );
2423 }
2524
Original file line number Diff line number Diff line change 22
33namespace Omnipay \EPays \Tests \Message \MyCash ;
44
5- use Omnipay \Common \Exception \InvalidResponseException ;
5+ use Omnipay \Common \Exception \InvalidRequestException ;
66use Omnipay \Common \Message \NotificationInterface ;
77use Omnipay \EPays \Message \MyCash \AcceptNotificationRequest ;
88use Omnipay \EPays \Message \MyCash \CompletePurchaseRequest ;
@@ -18,7 +18,7 @@ class AcceptNotificationRequestTest extends TestCase
1818
1919 public function testValidateFails (): void
2020 {
21- $ this ->expectException (InvalidResponseException ::class);
21+ $ this ->expectException (InvalidRequestException ::class);
2222
2323 $ options = [
2424 'RtnCode ' => '1 ' ,
Original file line number Diff line number Diff line change 22
33namespace Omnipay \EPays \Tests \Message \MyCash ;
44
5- use Omnipay \Common \Exception \InvalidResponseException ;
5+ use Omnipay \Common \Exception \InvalidRequestException ;
66use Omnipay \EPays \Message \MyCash \CompletePurchaseRequest ;
77use Omnipay \Tests \TestCase ;
88
@@ -16,7 +16,7 @@ class CompletePurchaseRequestTest extends TestCase
1616
1717 public function testValidateFails (): void
1818 {
19- $ this ->expectException (InvalidResponseException ::class);
19+ $ this ->expectException (InvalidRequestException ::class);
2020 $ this ->expectExceptionMessage ('Incorrect hash ' );
2121
2222 $ options = [
You can’t perform that action at this time.
0 commit comments