Skip to content

Commit b9125f3

Browse files
author
brianmc
committed
merged future changes
2 parents d63a785 + bb055d2 commit b9125f3

12 files changed

+21
-23
lines changed

‎classmap.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
'Doctrine\Common\Annotations\SimpleAnnotationReader' => $vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php',
3636
'Doctrine\Common\Annotations\TokenParser' => $vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php',
3737
'Doctrine\Common\Lexer\AbstractLexer' => $vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
38-
'Goetas\Xsd\XsdToPhp\Jms\Handler\BaseTypesHandler' => $vendorDir . '/goetas/xsd2php/lib/Jms/Handler/BaseTypesHandler.php',
39-
'Goetas\Xsd\XsdToPhp\Jms\Handler\XmlSchemaDateHandler' => $vendorDir . '/goetas/xsd2php/lib/Jms/Handler/XmlSchemaDateHandler.php',
38+
'GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\BaseTypesHandler' => $vendorDir . '/goetas-webservices/xsd2php-runtime/src/Jms/Handler/BaseTypesHandler.php',
39+
'GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\XmlSchemaDateHandler' => $vendorDir . '/goetas-webservices/xsd2php-runtime/src/Jms/Handler/XmlSchemaDateHandler.php',
4040
'JMS\Parser\AbstractLexer' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/AbstractLexer.php',
4141
'JMS\Parser\AbstractParser' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/AbstractParser.php',
4242
'JMS\Parser\SimpleLexer' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/SimpleLexer.php',

‎composer.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@
1111
"ext-json": "*",
1212
"ext-simplexml": "*",
1313
"ext-xmlwriter": "*",
14-
"goetas/xsd2php": "2.0.x-dev#fdc2ab0bb3f2b3ab796ca567cf8c0f3446a7ea3a",
15-
"goetas/xsd-reader": "2.*@dev",
16-
"jms/serializer": "xsd2php-dev as 0.18.0"
14+
"goetas-webservices/xsd2php-runtime":"^0.2",
15+
"goetas-webservices/xsd-reader": "^0.1",
16+
"jms/serializer": "serializer-master-dev as 1.0"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~4.0",
2020
"phpmd/phpmd": "~2.0"
2121
},
22-
"suggest": {
23-
"phpdocumentor/phpdocumentor": "For generating API documentation"
24-
},
2522
"autoload": {
2623
"classmap": ["lib"]
2724
},

‎lib/net/authorize/api/controller/base/ApiOperationBase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
use InvalidArgumentException;
55
use JMS\Serializer\SerializerBuilder;
66
use JMS\Serializer\handler\HandlerRegistryInterface;
7-
use Goetas\Xsd\XsdToPhp\Jms\Handler\BaseTypesHandler;
8-
use Goetas\Xsd\XsdToPhp\Jms\Handler\XmlSchemaDateHandler;
7+
use GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\BaseTypesHandler;
8+
use GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\XmlSchemaDateHandler;
99

1010
use \net\authorize\util\HttpClient;
1111
use \net\authorize\util\Helpers;

‎lib/net/authorize/api/yml/v1/BatchDetailsType.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\BatchDetailsType:
1919
accessor:
2020
getter: getSettlementTimeUTC
2121
setter: setSettlementTimeUTC
22-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
22+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
2323
settlementTimeLocal:
2424
expose: true
2525
access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\BatchDetailsType:
2929
accessor:
3030
getter: getSettlementTimeLocal
3131
setter: setSettlementTimeLocal
32-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
32+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
3333
settlementState:
3434
expose: true
3535
access_type: public_method

‎lib/net/authorize/api/yml/v1/CustomerProfileSummaryType.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ net\authorize\api\contract\v1\CustomerProfileSummaryType:
4949
accessor:
5050
getter: getCreatedDate
5151
setter: setCreatedDate
52-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
52+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime

‎lib/net/authorize/api/yml/v1/GetSettledBatchListRequest.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ net\authorize\api\contract\v1\GetSettledBatchListRequest:
2121
accessor:
2222
getter: getFirstSettlementDate
2323
setter: setFirstSettlementDate
24-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
24+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
2525
lastSettlementDate:
2626
expose: true
2727
access_type: public_method
@@ -31,4 +31,4 @@ net\authorize\api\contract\v1\GetSettledBatchListRequest:
3131
accessor:
3232
getter: getLastSettlementDate
3333
setter: setLastSettlementDate
34-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
34+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime

‎lib/net/authorize/api/yml/v1/ReturnedItemType.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\ReturnedItemType:
1919
accessor:
2020
getter: getDateUTC
2121
setter: setDateUTC
22-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
22+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
2323
dateLocal:
2424
expose: true
2525
access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\ReturnedItemType:
2929
accessor:
3030
getter: getDateLocal
3131
setter: setDateLocal
32-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
32+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
3333
code:
3434
expose: true
3535
access_type: public_method

‎lib/net/authorize/api/yml/v1/SubscriptionDetailType.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ net\authorize\api\contract\v1\SubscriptionDetailType:
3939
accessor:
4040
getter: getCreateTimeStampUTC
4141
setter: setCreateTimeStampUTC
42-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
42+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
4343
firstName:
4444
expose: true
4545
access_type: public_method

‎lib/net/authorize/api/yml/v1/TransactionDetailsType.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ net\authorize\api\contract\v1\TransactionDetailsType:
3939
accessor:
4040
getter: getSubmitTimeUTC
4141
setter: setSubmitTimeUTC
42-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
42+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
4343
submitTimeLocal:
4444
expose: true
4545
access_type: public_method
@@ -49,7 +49,7 @@ net\authorize\api\contract\v1\TransactionDetailsType:
4949
accessor:
5050
getter: getSubmitTimeLocal
5151
setter: setSubmitTimeLocal
52-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
52+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
5353
transactionType:
5454
expose: true
5555
access_type: public_method

‎lib/net/authorize/api/yml/v1/TransactionSummaryType.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\TransactionSummaryType:
1919
accessor:
2020
getter: getSubmitTimeUTC
2121
setter: setSubmitTimeUTC
22-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
22+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
2323
submitTimeLocal:
2424
expose: true
2525
access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\TransactionSummaryType:
2929
accessor:
3030
getter: getSubmitTimeLocal
3131
setter: setSubmitTimeLocal
32-
type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
32+
type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
3333
transactionStatus:
3434
expose: true
3535
access_type: public_method

‎tests/AuthorizeNetAIM_Test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ public function testAuthCaptureCustomFields()
484484
$sale = new AuthorizeNetAIM;
485485
$sale->setFields(
486486
array(
487-
'amount' => rand(1, 1000),
487+
'amount' => rand(1, 90000),
488488
'card_num' => '6011000000000012',
489489
'exp_date' => '0420'
490490
)

‎tests/AuthorizeNetCIM_Test.php

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class AuthorizeNetCIM_Test extends PHPUnit_Framework_TestCase
55

66
public function testDeleteAllCustomerProfiles()
77
{
8+
$this->markTestSkipped('This test was taking much too long, need to revisit BM 20160615'); //TODO
89
$request = new AuthorizeNetCIM;
910
$response = $request->getCustomerProfileIds();
1011
$customers = $response->getCustomerProfileIds();

0 commit comments

Comments
 (0)