Skip to content

Commit f982112

Browse files
ashtruashtru
committed
Merge branch 'master' into future
2 parents fd1badb + a8f7ddb commit f982112

51 files changed

Lines changed: 1917 additions & 20 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,8 @@ require 'vendor/autoload.php';
3434
"require": {
3535
"php": ">=5.5",
3636
"ext-curl": "*",
37-
"authorizenet/authorizenet": "1.8.9",
38-
"jms/serializer": "serializer-master-dev as 1.0"
39-
},
40-
"repositories": [{
41-
"type": "vcs",
42-
"url": "https://github.com/goetas/serializer.git"
43-
}]
37+
"authorizenet/authorizenet": "1.9.2"
38+
}
4439
}
4540
```
4641

‎classmap.php‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,15 @@
4444
'JMS\Parser\SimpleLexer' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/SimpleLexer.php',
4545
'JMS\Parser\SyntaxErrorException' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/SyntaxErrorException.php',
4646
'JMS\Serializer\AbstractVisitor' => $vendorDir . '/jms/serializer/src/JMS/Serializer/AbstractVisitor.php',
47+
'JMS\Serializer\ArrayTransformerInterface' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ArrayTransformerInterface.php',
4748
'JMS\Serializer\Context' => $vendorDir . '/jms/serializer/src/JMS/Serializer/Context.php',
49+
'JMS\Serializer\ContextFactory\CallableContextFactory' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/CallableContextFactory.php',
50+
'JMS\Serializer\ContextFactory\CallableDeserializationContextFactory' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/CallableDeserializationContextFactory.php',
51+
'JMS\Serializer\ContextFactory\CallableSerializationContextFactory' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/CallableSerializationContextFactory.php',
52+
'JMS\Serializer\ContextFactory\DefaultDeserializationContextFactory' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/DefaultDeserializationContextFactory.php',
53+
'JMS\Serializer\ContextFactory\DefaultSerializationContextFactory' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/DefaultSerializationContextFactory.php',
54+
'JMS\Serializer\ContextFactory\DeserializationContextFactoryInterface' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/DeserializationContextFactoryInterface.php',
55+
'JMS\Serializer\ContextFactory\SerializationContextFactoryInterface' => $vendorDir . '/jms/serializer/src/JMS/Serializer/ContextFactory/SerializationContextFactoryInterface.php',
4856
'JMS\Serializer\DeserializationContext' => $vendorDir . '/jms/serializer/src/JMS/Serializer/DeserializationContext.php',
4957
'JMS\Serializer\GenericDeserializationVisitor' => $vendorDir . '/jms/serializer/src/JMS/Serializer/GenericDeserializationVisitor.php',
5058
'JMS\Serializer\GenericSerializationVisitor' => $vendorDir . '/jms/serializer/src/JMS/Serializer/GenericSerializationVisitor.php',
@@ -314,6 +322,7 @@
314322
'net\authorize\api\contract\v1\ExtendedAmountType' => $libDir . 'net/authorize/api/contract/v1/ExtendedAmountType.php',
315323
'net\authorize\api\contract\v1\FDSFilterType' => $libDir . 'net/authorize/api/contract/v1/FDSFilterType.php',
316324
'net\authorize\api\contract\v1\FingerPrintType' => $libDir . 'net/authorize/api/contract/v1/FingerPrintType.php',
325+
'net\authorize\api\contract\v1\FraudInformationType.php' => $libDir . 'net/authorize/api/contract/v1/FraudInformationType.php',
317326
'net\authorize\api\contract\v1\GetBatchStatisticsRequest' => $libDir . 'net/authorize/api/contract/v1/GetBatchStatisticsRequest.php',
318327
'net\authorize\api\contract\v1\GetBatchStatisticsResponse' => $libDir . 'net/authorize/api/contract/v1/GetBatchStatisticsResponse.php',
319328
'net\authorize\api\contract\v1\GetCustomerPaymentProfileListRequest' => $libDir . 'net/authorize/api/contract/v1/GetCustomerPaymentProfileListRequest.php',
@@ -326,8 +335,12 @@
326335
'net\authorize\api\contract\v1\GetCustomerProfileResponse' => $libDir . 'net/authorize/api/contract/v1/GetCustomerProfileResponse.php',
327336
'net\authorize\api\contract\v1\GetCustomerShippingAddressRequest' => $libDir . 'net/authorize/api/contract/v1/GetCustomerShippingAddressRequest.php',
328337
'net\authorize\api\contract\v1\GetCustomerShippingAddressResponse' => $libDir . 'net/authorize/api/contract/v1/GetCustomerShippingAddressResponse.php',
338+
'net\authorize\api\contract\v1\GetHostedPaymentPageRequest.php' => $libDir . 'net/authorize/api/contract/v1/GetHostedPaymentPageRequest.php',
339+
'net\authorize\api\contract\v1\GetHostedPaymentPageResponse.php' => $libDir . 'net/authorize/api/contract/v1/GetHostedPaymentPageResponse.php',
329340
'net\authorize\api\contract\v1\GetHostedProfilePageRequest' => $libDir . 'net/authorize/api/contract/v1/GetHostedProfilePageRequest.php',
330341
'net\authorize\api\contract\v1\GetHostedProfilePageResponse' => $libDir . 'net/authorize/api/contract/v1/GetHostedProfilePageResponse.php',
342+
'net\authorize\api\contract\v1\GetMerchantDetailsRequest.php' => $libDir . 'net/authorize/api/contract/v1/GetMerchantDetailsRequest.php',
343+
'net\authorize\api\contract\v1\GetMerchantDetailsResponse.php' => $libDir . 'net/authorize/api/contract/v1/GetMerchantDetailsResponse.php',
331344
'net\authorize\api\contract\v1\GetSettledBatchListRequest' => $libDir . 'net/authorize/api/contract/v1/GetSettledBatchListRequest.php',
332345
'net\authorize\api\contract\v1\GetSettledBatchListResponse' => $libDir . 'net/authorize/api/contract/v1/GetSettledBatchListResponse.php',
333346
'net\authorize\api\contract\v1\GetTransactionDetailsRequest' => $libDir . 'net/authorize/api/contract/v1/GetTransactionDetailsRequest.php',
@@ -336,6 +349,7 @@
336349
'net\authorize\api\contract\v1\GetTransactionListResponse' => $libDir . 'net/authorize/api/contract/v1/GetTransactionListResponse.php',
337350
'net\authorize\api\contract\v1\GetUnsettledTransactionListRequest' => $libDir . 'net/authorize/api/contract/v1/GetUnsettledTransactionListRequest.php',
338351
'net\authorize\api\contract\v1\GetUnsettledTransactionListResponse' => $libDir . 'net/authorize/api/contract/v1/GetUnsettledTransactionListResponse.php',
352+
'net\authorize\api\contract\v1\HeldTransactionRequestType.php' => $libDir . 'net/authorize/api/contract/v1/HeldTransactionRequestType.php',
339353
'net\authorize\api\contract\v1\ImpersonationAuthenticationType' => $libDir . 'net/authorize/api/contract/v1/ImpersonationAuthenticationType.php',
340354
'net\authorize\api\contract\v1\IsAliveRequest' => $libDir . 'net/authorize/api/contract/v1/IsAliveRequest.php',
341355
'net\authorize\api\contract\v1\IsAliveResponse' => $libDir . 'net/authorize/api/contract/v1/IsAliveResponse.php',
@@ -366,6 +380,7 @@
366380
'net\authorize\api\contract\v1\PaymentType' => $libDir . 'net/authorize/api/contract/v1/PaymentType.php',
367381
'net\authorize\api\contract\v1\PayPalType' => $libDir . 'net/authorize/api/contract/v1/PayPalType.php',
368382
'net\authorize\api\contract\v1\PermissionType' => $libDir . 'net/authorize/api/contract/v1/PermissionType.php',
383+
'net\authorize\api\contract\v1\ProcessorType.php' => $libDir . 'net/authorize/api/contract/v1/ProcessorType.php',
369384
'net\authorize\api\contract\v1\ProfileTransactionType' => $libDir . 'net/authorize/api/contract/v1/ProfileTransactionType.php',
370385
'net\authorize\api\contract\v1\ProfileTransAmountType' => $libDir . 'net/authorize/api/contract/v1/ProfileTransAmountType.php',
371386
'net\authorize\api\contract\v1\ProfileTransAuthCaptureType' => $libDir . 'net/authorize/api/contract/v1/ProfileTransAuthCaptureType.php',
@@ -386,6 +401,7 @@
386401
'net\authorize\api\contract\v1\SubscriptionPaymentType' => $libDir . 'net/authorize/api/contract/v1/SubscriptionPaymentType.php',
387402
'net\authorize\api\contract\v1\TokenMaskedType' => $libDir . 'net/authorize/api/contract/v1/TokenMaskedType.php',
388403
'net\authorize\api\contract\v1\TransactionDetailsType' => $libDir . 'net/authorize/api/contract/v1/TransactionDetailsType.php',
404+
'net\authorize\api\contract\v1\TransactionListSortingType.php' => $libDir . 'net/authorize/api/contract/v1/TransactionListSortingType.php',
389405
'net\authorize\api\contract\v1\TransactionRequestType' => $libDir . 'net/authorize/api/contract/v1/TransactionRequestType.php',
390406
'net\authorize\api\contract\v1\TransactionResponseType' => $libDir . 'net/authorize/api/contract/v1/TransactionResponseType.php',
391407
'net\authorize\api\contract\v1\TransactionSummaryType' => $libDir . 'net/authorize/api/contract/v1/TransactionSummaryType.php',
@@ -396,6 +412,8 @@
396412
'net\authorize\api\contract\v1\UpdateCustomerProfileResponse' => $libDir . 'net/authorize/api/contract/v1/UpdateCustomerProfileResponse.php',
397413
'net\authorize\api\contract\v1\UpdateCustomerShippingAddressRequest' => $libDir . 'net/authorize/api/contract/v1/UpdateCustomerShippingAddressRequest.php',
398414
'net\authorize\api\contract\v1\UpdateCustomerShippingAddressResponse' => $libDir . 'net/authorize/api/contract/v1/UpdateCustomerShippingAddressResponse.php',
415+
'net\authorize\api\contract\v1\UpdateHeldTransactionRequest.php' => $libDir . 'net/authorize/api/contract/v1/UpdateHeldTransactionRequest.php',
416+
'net\authorize\api\contract\v1\UpdateHeldTransactionResponse.php' => $libDir . 'net/authorize/api/contract/v1/UpdateHeldTransactionResponse.php',
399417
'net\authorize\api\contract\v1\UpdateSplitTenderGroupRequest' => $libDir . 'net/authorize/api/contract/v1/UpdateSplitTenderGroupRequest.php',
400418
'net\authorize\api\contract\v1\UpdateSplitTenderGroupResponse' => $libDir . 'net/authorize/api/contract/v1/UpdateSplitTenderGroupResponse.php',
401419
'net\authorize\api\contract\v1\UserFieldType' => $libDir . 'net/authorize/api/contract/v1/UserFieldType.php',
@@ -457,7 +475,9 @@
457475
'net\authorize\api\controller\GetCustomerProfileController' => $libDir . 'net/authorize/api/controller/GetCustomerProfileController.php',
458476
'net\authorize\api\controller\GetCustomerProfileIdsController' => $libDir . 'net/authorize/api/controller/GetCustomerProfileIdsController.php',
459477
'net\authorize\api\controller\GetCustomerShippingAddressController' => $libDir . 'net/authorize/api/controller/GetCustomerShippingAddressController.php',
478+
'net\authorize\api\controller\GetHostedPaymentPageController' => $libDir . 'net/authorize/api/controller/GetHostedPaymentPageController.php',
460479
'net\authorize\api\controller\GetHostedProfilePageController' => $libDir . 'net/authorize/api/controller/GetHostedProfilePageController.php',
480+
'net\authorize\api\controller\GetMerchantDetailsController' => $libDir . 'net/authorize/api/controller/GetMerchantDetailsController.php',
461481
'net\authorize\api\controller\GetSettledBatchListController' => $libDir . 'net/authorize/api/controller/GetSettledBatchListController.php',
462482
'net\authorize\api\controller\GetTransactionDetailsController' => $libDir . 'net/authorize/api/controller/GetTransactionDetailsController.php',
463483
'net\authorize\api\controller\GetTransactionListController' => $libDir . 'net/authorize/api/controller/GetTransactionListController.php',
@@ -470,10 +490,11 @@
470490
'net\authorize\api\controller\UpdateCustomerPaymentProfileController' => $libDir . 'net/authorize/api/controller/UpdateCustomerPaymentProfileController.php',
471491
'net\authorize\api\controller\UpdateCustomerProfileController' => $libDir . 'net/authorize/api/controller/UpdateCustomerProfileController.php',
472492
'net\authorize\api\controller\UpdateCustomerShippingAddressController' => $libDir . 'net/authorize/api/controller/UpdateCustomerShippingAddressController.php',
493+
'net\authorize\api\controller\UpdateHeldTransactionController' => $libDir . 'net/authorize/api/controller/UpdateHeldTransactionController.php',
473494
'net\authorize\api\controller\UpdateSplitTenderGroupController' => $libDir . 'net/authorize/api/controller/UpdateSplitTenderGroupController.php',
474495
'net\authorize\api\controller\ValidateCustomerPaymentProfileController' => $libDir . 'net/authorize/api/controller/ValidateCustomerPaymentProfileController.php',
475496

476497
'net\authorize\api\controller\GetAUJobDetailsController' => $libDir . 'net/authorize/api/controller/GetAUJobDetailsController.php',
477-
'net\authorize\api\controller\GetAUJobSummaryController' => $libDir . 'net/authorize/api/controller/GetAUJobSummaryController.php',
498+
'net\authorize\api\controller\GetAUJobSummaryController' => $libDir . 'net/authorize/api/controller/GetAUJobSummaryController.php'
478499

479500
);

‎composer.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
"ext-json": "*",
1212
"ext-simplexml": "*",
1313
"ext-xmlwriter": "*",
14-
"goetas/xsd2php": "^2.0",
15-
"goetas-webservices/xsd2php-runtime":"^0.2",
16-
"goetas-webservices/xsd-reader": "^0.1",
17-
"jms/serializer": "serializer-master-dev as 1.0",
18-
"symfony/yaml": "^3.1"
14+
"goetas-webservices/xsd2php-runtime":"^0.2.2"
1915
},
2016
"require-dev": {
2117
"phpunit/phpunit": "~4.0",
@@ -26,9 +22,5 @@
2622
},
2723
"autoload-dev": {
2824
"classmap": ["tests"]
29-
},
30-
"repositories": [{
31-
"type": "vcs",
32-
"url": "https://github.com/goetas/serializer.git"
33-
}]
25+
}
3426
}

‎lib/net/authorize/api/constants/ANetEnvironment.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ class ANetEnvironment
77
const SANDBOX = "https://apitest.authorize.net";
88
const PRODUCTION = "https://api2.authorize.net";
99

10-
const VERSION = "1.9.0";
10+
const VERSION = "1.9.1";
1111
}

‎lib/net/authorize/api/contract/v1/CreateCustomerProfileFromTransactionRequest.php‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ class CreateCustomerProfileFromTransactionRequest extends ANetApiRequestType
2323
*/
2424
private $customerProfileId = null;
2525

26+
/**
27+
* @property boolean $defaultPaymentProfile
28+
*/
29+
private $defaultPaymentProfile = null;
30+
31+
/**
32+
* @property boolean $defaultShippingAddress
33+
*/
34+
private $defaultShippingAddress = null;
35+
2636
/**
2737
* Gets as transId
2838
*
@@ -89,6 +99,50 @@ public function setCustomerProfileId($customerProfileId)
8999
return $this;
90100
}
91101

102+
/**
103+
* Gets as defaultPaymentProfile
104+
*
105+
* @return boolean
106+
*/
107+
public function getDefaultPaymentProfile()
108+
{
109+
return $this->defaultPaymentProfile;
110+
}
111+
112+
/**
113+
* Sets a new defaultPaymentProfile
114+
*
115+
* @param boolean $defaultPaymentProfile
116+
* @return self
117+
*/
118+
public function setDefaultPaymentProfile($defaultPaymentProfile)
119+
{
120+
$this->defaultPaymentProfile = $defaultPaymentProfile;
121+
return $this;
122+
}
123+
124+
/**
125+
* Gets as defaultShippingAddress
126+
*
127+
* @return boolean
128+
*/
129+
public function getDefaultShippingAddress()
130+
{
131+
return $this->defaultShippingAddress;
132+
}
133+
134+
/**
135+
* Sets a new defaultShippingAddress
136+
*
137+
* @param boolean $defaultShippingAddress
138+
* @return self
139+
*/
140+
public function setDefaultShippingAddress($defaultShippingAddress)
141+
{
142+
$this->defaultShippingAddress = $defaultShippingAddress;
143+
return $this;
144+
}
145+
92146

93147
}
94148

‎lib/net/authorize/api/contract/v1/CreateCustomerShippingAddressRequest.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ class CreateCustomerShippingAddressRequest extends ANetApiRequestType
1818
*/
1919
private $address = null;
2020

21+
/**
22+
* @property boolean $defaultShippingAddress
23+
*/
24+
private $defaultShippingAddress = null;
25+
2126
/**
2227
* Gets as customerProfileId
2328
*
@@ -62,6 +67,28 @@ public function setAddress(\net\authorize\api\contract\v1\CustomerAddressType $a
6267
return $this;
6368
}
6469

70+
/**
71+
* Gets as defaultShippingAddress
72+
*
73+
* @return boolean
74+
*/
75+
public function getDefaultShippingAddress()
76+
{
77+
return $this->defaultShippingAddress;
78+
}
79+
80+
/**
81+
* Sets a new defaultShippingAddress
82+
*
83+
* @param boolean $defaultShippingAddress
84+
* @return self
85+
*/
86+
public function setDefaultShippingAddress($defaultShippingAddress)
87+
{
88+
$this->defaultShippingAddress = $defaultShippingAddress;
89+
return $this;
90+
}
91+
6592

6693
}
6794

‎lib/net/authorize/api/contract/v1/CustomerPaymentProfileListItemType.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
class CustomerPaymentProfileListItemType
1212
{
1313

14+
/**
15+
* @property boolean $defaultPaymentProfile
16+
*/
17+
private $defaultPaymentProfile = null;
18+
1419
/**
1520
* @property integer $customerPaymentProfileId
1621
*/
@@ -31,6 +36,28 @@ class CustomerPaymentProfileListItemType
3136
*/
3237
private $payment = null;
3338

39+
/**
40+
* Gets as defaultPaymentProfile
41+
*
42+
* @return boolean
43+
*/
44+
public function getDefaultPaymentProfile()
45+
{
46+
return $this->defaultPaymentProfile;
47+
}
48+
49+
/**
50+
* Sets a new defaultPaymentProfile
51+
*
52+
* @param boolean $defaultPaymentProfile
53+
* @return self
54+
*/
55+
public function setDefaultPaymentProfile($defaultPaymentProfile)
56+
{
57+
$this->defaultPaymentProfile = $defaultPaymentProfile;
58+
return $this;
59+
}
60+
3461
/**
3562
* Gets as customerPaymentProfileId
3663
*

‎lib/net/authorize/api/contract/v1/CustomerPaymentProfileMaskedType.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ class CustomerPaymentProfileMaskedType extends CustomerPaymentProfileBaseType
2121
*/
2222
private $customerPaymentProfileId = null;
2323

24+
/**
25+
* @property boolean $defaultPaymentProfile
26+
*/
27+
private $defaultPaymentProfile = null;
28+
2429
/**
2530
* @property \net\authorize\api\contract\v1\PaymentMaskedType $payment
2631
*/
@@ -86,6 +91,28 @@ public function setCustomerPaymentProfileId($customerPaymentProfileId)
8691
return $this;
8792
}
8893

94+
/**
95+
* Gets as defaultPaymentProfile
96+
*
97+
* @return boolean
98+
*/
99+
public function getDefaultPaymentProfile()
100+
{
101+
return $this->defaultPaymentProfile;
102+
}
103+
104+
/**
105+
* Sets a new defaultPaymentProfile
106+
*
107+
* @param boolean $defaultPaymentProfile
108+
* @return self
109+
*/
110+
public function setDefaultPaymentProfile($defaultPaymentProfile)
111+
{
112+
$this->defaultPaymentProfile = $defaultPaymentProfile;
113+
return $this;
114+
}
115+
89116
/**
90117
* Gets as payment
91118
*

‎lib/net/authorize/api/contract/v1/CustomerPaymentProfileType.php‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ class CustomerPaymentProfileType extends CustomerPaymentProfileBaseType
2626
*/
2727
private $taxId = null;
2828

29+
/**
30+
* @property boolean $defaultPaymentProfile
31+
*/
32+
private $defaultPaymentProfile = null;
33+
2934
/**
3035
* Gets as payment
3136
*
@@ -92,6 +97,28 @@ public function setTaxId($taxId)
9297
return $this;
9398
}
9499

100+
/**
101+
* Gets as defaultPaymentProfile
102+
*
103+
* @return boolean
104+
*/
105+
public function getDefaultPaymentProfile()
106+
{
107+
return $this->defaultPaymentProfile;
108+
}
109+
110+
/**
111+
* Sets a new defaultPaymentProfile
112+
*
113+
* @param boolean $defaultPaymentProfile
114+
* @return self
115+
*/
116+
public function setDefaultPaymentProfile($defaultPaymentProfile)
117+
{
118+
$this->defaultPaymentProfile = $defaultPaymentProfile;
119+
return $this;
120+
}
121+
95122

96123
}
97124

0 commit comments

Comments
 (0)