Skip to content

Commit bd23ae4

Browse files
judgejjudgej
authored
Merge pull request #126 from thephpleague/issue125
Fixes to the query functions.
2 parents 58948ff + 671c8de commit bd23ae4

35 files changed

+186
-93
lines changed

‎composer.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
"psr-4": { "Omnipay\\AuthorizeNet\\" : "src/" }
2929
},
3030
"require": {
31-
"omnipay/common": "^3"
31+
"omnipay/common": "^3",
32+
"ext-json": "*",
33+
"ext-libxml": "*",
34+
"ext-simplexml": "*"
3235
},
3336
"require-dev": {
3437
"omnipay/tests": "^3",

‎src/AIMGateway.php

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
namespace Omnipay\AuthorizeNet;
44

55
use Omnipay\AuthorizeNet\Message\AIMAuthorizeRequest;
6+
use Omnipay\AuthorizeNet\Message\AIMCaptureOnlyRequest;
67
use Omnipay\AuthorizeNet\Message\AIMCaptureRequest;
7-
use Omnipay\AuthorizeNet\Message\AIMPaymentPlanQueryResponse;
8+
use Omnipay\AuthorizeNet\Message\Query\AIMPaymentPlanQueryResponse;
89
use Omnipay\AuthorizeNet\Message\AIMPurchaseRequest;
9-
use Omnipay\AuthorizeNet\Message\QueryRequest;
1010
use Omnipay\AuthorizeNet\Message\AIMRefundRequest;
1111
use Omnipay\AuthorizeNet\Message\AIMVoidRequest;
12+
use Omnipay\AuthorizeNet\Message\Query\AIMPaymentPlansQueryRequest;
13+
use Omnipay\AuthorizeNet\Message\Query\QueryResponse;
1214
use Omnipay\Common\AbstractGateway;
1315

1416
/**
@@ -126,7 +128,10 @@ public function setDuplicateWindow($value)
126128
*/
127129
public function authorize(array $parameters = array())
128130
{
129-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMAuthorizeRequest', $parameters);
131+
return $this->createRequest(
132+
AIMAuthorizeRequest::class,
133+
$parameters
134+
);
130135
}
131136

132137
/**
@@ -135,7 +140,10 @@ public function authorize(array $parameters = array())
135140
*/
136141
public function capture(array $parameters = array())
137142
{
138-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMCaptureRequest', $parameters);
143+
return $this->createRequest(
144+
AIMCaptureRequest::class,
145+
$parameters
146+
);
139147
}
140148

141149
/**
@@ -144,7 +152,10 @@ public function capture(array $parameters = array())
144152
*/
145153
public function captureOnly(array $parameters = array())
146154
{
147-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMCaptureOnlyRequest', $parameters);
155+
return $this->createRequest(
156+
AIMCaptureOnlyRequest::class,
157+
$parameters
158+
);
148159
}
149160

150161
/**
@@ -153,7 +164,10 @@ public function captureOnly(array $parameters = array())
153164
*/
154165
public function purchase(array $parameters = array())
155166
{
156-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMPurchaseRequest', $parameters);
167+
return $this->createRequest(
168+
AIMPurchaseRequest::class,
169+
$parameters
170+
);
157171
}
158172

159173
/**
@@ -162,7 +176,10 @@ public function purchase(array $parameters = array())
162176
*/
163177
public function void(array $parameters = array())
164178
{
165-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMVoidRequest', $parameters);
179+
return $this->createRequest(
180+
AIMVoidRequest::class,
181+
$parameters
182+
);
166183
}
167184

168185
/**
@@ -171,7 +188,10 @@ public function void(array $parameters = array())
171188
*/
172189
public function refund(array $parameters = array())
173190
{
174-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\AIMRefundRequest', $parameters);
191+
return $this->createRequest(
192+
AIMRefundRequest::class,
193+
$parameters
194+
);
175195
}
176196

177197
/**
@@ -180,16 +200,22 @@ public function refund(array $parameters = array())
180200
*/
181201
public function paymentPlansQuery(array $parameters = array())
182202
{
183-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\Query\AIMPaymentPlansQueryRequest', $parameters);
203+
return $this->createRequest(
204+
Message\Query\AIMPaymentPlansQueryRequest::class,
205+
$parameters
206+
);
184207
}
185208

186209
/**
187210
* @param array $parameters
188-
* @return AIMPaymentPlanQueryResponse
211+
* @return \Omnipay\Common\Message\AbstractRequest
189212
*/
190213
public function paymentPlanQuery(array $parameters = array())
191214
{
192-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\Query\AIMPaymentPlanQueryRequest', $parameters);
215+
return $this->createRequest(
216+
Message\Query\AIMPaymentPlanQueryRequest::class,
217+
$parameters
218+
);
193219
}
194220

195221
/**
@@ -198,33 +224,45 @@ public function paymentPlanQuery(array $parameters = array())
198224
*/
199225
public function query(array $parameters = array())
200226
{
201-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\Query\QueryRequest', $parameters);
227+
return $this->createRequest(
228+
Message\Query\QueryRequest::class,
229+
$parameters
230+
);
202231
}
203232

204233
/**
205234
* @param array $parameters
206-
* @return QueryBatchResponse
235+
* @return Message\Query\QueryBatchRequest
207236
*/
208237
public function queryBatch(array $parameters = array())
209238
{
210-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\QueryBatchRequest', $parameters);
239+
return $this->createRequest(
240+
Message\Query\QueryBatchRequest::class,
241+
$parameters
242+
);
211243
}
212244

213245
/**
214246
* @param array $parameters
215-
* @return QueryBatchDetailResponse
247+
* @return Message\Query\QueryBatchDetailRequest
216248
*/
217249
public function queryBatchDetail(array $parameters = array())
218250
{
219-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\QueryBatchDetailRequest', $parameters);
251+
return $this->createRequest(
252+
Message\Query\QueryBatchDetailRequest::class,
253+
$parameters
254+
);
220255
}
221256

222257
/**
223258
* @param array $parameters
224-
* @return QueryDetailResponse
259+
* @return Message\Query\QueryDetailRequest
225260
*/
226261
public function queryDetail(array $parameters = array())
227262
{
228-
return $this->createRequest('\Omnipay\AuthorizeNet\Message\QueryDetailRequest', $parameters);
263+
return $this->createRequest(
264+
Message\Query\QueryDetailRequest::class,
265+
$parameters
266+
);
229267
}
230268
}

‎src/DPMGateway.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public function getName()
1414

1515
/**
1616
* Helper to generate the authorize direct-post form.
17+
* @param array $parameters
18+
* @return \Omnipay\Common\Message\AbstractRequest
1719
*/
1820
public function authorize(array $parameters = array())
1921
{

‎src/Message/AIMAbstractRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ protected function addReferenceId(\SimpleXMLElement $data)
276276

277277
protected function addTransactionType(\SimpleXMLElement $data)
278278
{
279-
if (!$this->action) {
280-
// The extending class probably hasn't specified an "action"
279+
if (! $this->action) {
280+
// The extending class probably hasn't specified an "action".
281281
throw new InvalidRequestException();
282282
}
283283

‎src/Message/AIMCaptureOnlyRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message;
44

5-
use Omnipay\Common\CreditCard;
6-
75
/**
86
* Authorize.Net AIM Capture Only Request
97
*/

‎src/Message/CIMAbstractResponse.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ public function xml2array(\SimpleXMLElement $xml)
155155
{
156156
return json_decode(json_encode($xml), true);
157157

158+
// Old parser below, just keeping on a hunch.
159+
158160
$arr = array();
159161

160162
foreach ($xml as $element) {

‎src/Message/CIMCreateCardRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function getData()
2626
/**
2727
* Validate card or skip if opaque data is available
2828
*
29-
* @param \SimpleXMLElement $data
29+
* @throws \Omnipay\Common\Exception\InvalidCreditCardException
3030
*/
3131
protected function cardValidate()
3232
{

‎src/Message/CIMCreatePaymentProfileRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message;
44

5-
use Omnipay\Common\CreditCard;
6-
75
/**
86
* Request to create customer payment profile for existing customer.
97
*/

‎src/Message/CIMUpdatePaymentProfileRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message;
44

5-
use Omnipay\Common\CreditCard;
6-
75
/**
86
* Request to create customer payment profile for existing customer.
97
*/

‎src/Message/DPMAuthorizeRequest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public function getData()
5353
* The form may have most of the fields hidden, or may allow the user to change some details -
5454
* that depends on the use-case.
5555
* So this method will provide us with an object used to build the form.
56+
* @param $data
57+
* @return DPMResponse
5658
*/
5759
public function sendData($data)
5860
{

‎src/Message/DPMCompleteRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message;
44

5-
use Omnipay\Common\Exception\InvalidRequestException;
6-
75
/**
86
* Authorize.Net DPM Complete Authorize Request
97
*/

‎src/Message/DPMResponse.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ class DPMResponse extends AbstractResponse implements RedirectResponseInterface
7272

7373
public function __construct(RequestInterface $request, $data, $postUrl)
7474
{
75-
$this->request = $request;
76-
$this->data = $data;
75+
parent::__construct($request, $data);
76+
7777
$this->postUrl = $postUrl;
7878
}
7979

@@ -127,6 +127,7 @@ public function getRedirectData()
127127
* Move a field to the list of hidden form fields.
128128
* The hidden fields are those we don't want to show the user, but
129129
* must still be posted.
130+
* @param $field_name
130131
*/
131132
public function hideField($field_name)
132133
{

‎src/Message/Query/AIMAbstractQueryRequest.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,26 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\AuthorizeNet\Message\AIMAbstractRequest;
6-
75
/**
86
* Authorize.Net AIM Abstract Request
97
*/
8+
9+
use Omnipay\AuthorizeNet\Message\AIMAbstractRequest;
10+
use SimpleXMLElement;
11+
1012
abstract class AIMAbstractQueryRequest extends AIMAbstractRequest
1113
{
1214
protected $limit = 1000;
1315
protected $offset = 1;
1416

17+
/**
18+
* Disable validation check on the parent method.
19+
*/
20+
protected function addTransactionType(SimpleXMLElement $data)
21+
{
22+
// NOOP
23+
}
24+
1525
/**
1626
* Get Limit.
1727
*

‎src/Message/Query/AIMPaymentPlanQueryRequest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\Common\CreditCard;
6-
75
/**
86
* Authorize.Net AIM Authorize Request
97
*/

‎src/Message/Query/AIMPaymentPlanQueryResponse.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\AuthorizeNet\Model\CardReference;
6-
use Omnipay\AuthorizeNet\Model\TransactionReference;
75
use Omnipay\Common\Exception\InvalidResponseException;
86
use Omnipay\Common\Message\AbstractRequest;
97
use Omnipay\Common\Message\AbstractResponse;
@@ -20,7 +18,12 @@ class AIMPaymentPlanQueryResponse extends AbstractQueryResponse
2018
public function __construct(AbstractRequest $request, $data)
2119
{
2220
// Strip out the xmlns junk so that PHP can parse the XML
23-
$xml = preg_replace('/<ARBGetSubscriptionRequest[^>]+>/', '<ARBGetSubscriptionRequest>', (string)$data);
21+
$xml = preg_replace(
22+
'/<ARBGetSubscriptionRequest[^>]+>/',
23+
'<ARBGetSubscriptionRequest>',
24+
(string)$data
25+
);
26+
2427
try {
2528
$xml = simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOWARNING);
2629
} catch (\Exception $e) {

‎src/Message/Query/AIMPaymentPlansQueryRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\Common\CreditCard;
5+
use Omnipay\AuthorizeNet\Message\AIMAbstractRequest;
66

77
/**
88
* Authorize.Net AIM Authorize Request

‎src/Message/Query/AIMPaymentPlansQueryResponse.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\AuthorizeNet\Model\CardReference;
6-
use Omnipay\AuthorizeNet\Model\TransactionReference;
75
use Omnipay\Common\Exception\InvalidResponseException;
86
use Omnipay\Common\Message\AbstractRequest;
97
use Omnipay\Common\Message\AbstractResponse;

‎src/Message/Query/AbstractQueryResponse.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
namespace Omnipay\AuthorizeNet\Message\Query;
44

5-
use Omnipay\AuthorizeNet\Model\CardReference;
6-
use Omnipay\AuthorizeNet\Model\TransactionReference;
7-
use Omnipay\Common\Exception\InvalidResponseException;
85
use Omnipay\Common\Message\AbstractRequest;
96
use Omnipay\Common\Message\AbstractResponse;
107
use Omnipay\Omnipay;

0 commit comments

Comments
 (0)