merged future changes

AuthorizeNet · Jun 15, 2016 · b9125f3 · b9125f3
2 parents d63a785 + bb055d2
commit b9125f3
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 23 deletions.
diff --git a/classmap.php b/classmap.php
@@ -35,8 +35,8 @@
     'Doctrine\Common\Annotations\SimpleAnnotationReader' => $vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php',
     'Doctrine\Common\Annotations\TokenParser' => $vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php',
     'Doctrine\Common\Lexer\AbstractLexer' => $vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
-    'Goetas\Xsd\XsdToPhp\Jms\Handler\BaseTypesHandler' => $vendorDir . '/goetas/xsd2php/lib/Jms/Handler/BaseTypesHandler.php',
-    'Goetas\Xsd\XsdToPhp\Jms\Handler\XmlSchemaDateHandler' => $vendorDir . '/goetas/xsd2php/lib/Jms/Handler/XmlSchemaDateHandler.php',
+    'GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\BaseTypesHandler' => $vendorDir . '/goetas-webservices/xsd2php-runtime/src/Jms/Handler/BaseTypesHandler.php',
+    'GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\XmlSchemaDateHandler' => $vendorDir . '/goetas-webservices/xsd2php-runtime/src/Jms/Handler/XmlSchemaDateHandler.php',
     'JMS\Parser\AbstractLexer' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/AbstractLexer.php',
     'JMS\Parser\AbstractParser' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/AbstractParser.php',
     'JMS\Parser\SimpleLexer' => $vendorDir . '/jms/parser-lib/src/JMS/Parser/SimpleLexer.php',

diff --git a/composer.json b/composer.json
@@ -11,17 +11,14 @@
         "ext-json": "*",
         "ext-simplexml": "*",
         "ext-xmlwriter": "*",
-        "goetas/xsd2php": "2.0.x-dev#fdc2ab0bb3f2b3ab796ca567cf8c0f3446a7ea3a",
-        "goetas/xsd-reader": "2.*@dev",
-        "jms/serializer": "xsd2php-dev as 0.18.0"
+        "goetas-webservices/xsd2php-runtime":"^0.2",
+        "goetas-webservices/xsd-reader": "^0.1",
+        "jms/serializer": "serializer-master-dev as 1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "phpmd/phpmd": "~2.0"
     },
-    "suggest": {
-        "phpdocumentor/phpdocumentor": "For generating API documentation"
-    },
     "autoload": {
         "classmap": ["lib"]
     },

diff --git a/lib/net/authorize/api/controller/base/ApiOperationBase.php b/lib/net/authorize/api/controller/base/ApiOperationBase.php
@@ -4,8 +4,8 @@
 use InvalidArgumentException;
 use JMS\Serializer\SerializerBuilder;
 use JMS\Serializer\handler\HandlerRegistryInterface;
-use Goetas\Xsd\XsdToPhp\Jms\Handler\BaseTypesHandler;
-use Goetas\Xsd\XsdToPhp\Jms\Handler\XmlSchemaDateHandler;
+use GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\BaseTypesHandler;
+use GoetasWebservices\Xsd\XsdToPhpRuntime\Jms\Handler\XmlSchemaDateHandler;
 
 use \net\authorize\util\HttpClient;
 use \net\authorize\util\Helpers;

diff --git a/lib/net/authorize/api/yml/v1/BatchDetailsType.yml b/lib/net/authorize/api/yml/v1/BatchDetailsType.yml
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\BatchDetailsType:
             accessor:
                 getter: getSettlementTimeUTC
                 setter: setSettlementTimeUTC
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         settlementTimeLocal:
             expose: true
             access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\BatchDetailsType:
             accessor:
                 getter: getSettlementTimeLocal
                 setter: setSettlementTimeLocal
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         settlementState:
             expose: true
             access_type: public_method

diff --git a/lib/net/authorize/api/yml/v1/CustomerProfileSummaryType.yml b/lib/net/authorize/api/yml/v1/CustomerProfileSummaryType.yml
@@ -49,4 +49,4 @@ net\authorize\api\contract\v1\CustomerProfileSummaryType:
             accessor:
                 getter: getCreatedDate
                 setter: setCreatedDate
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
diff --git a/lib/net/authorize/api/yml/v1/GetSettledBatchListRequest.yml b/lib/net/authorize/api/yml/v1/GetSettledBatchListRequest.yml
@@ -21,7 +21,7 @@ net\authorize\api\contract\v1\GetSettledBatchListRequest:
             accessor:
                 getter: getFirstSettlementDate
                 setter: setFirstSettlementDate
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         lastSettlementDate:
             expose: true
             access_type: public_method
@@ -31,4 +31,4 @@ net\authorize\api\contract\v1\GetSettledBatchListRequest:
             accessor:
                 getter: getLastSettlementDate
                 setter: setLastSettlementDate
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
diff --git a/lib/net/authorize/api/yml/v1/ReturnedItemType.yml b/lib/net/authorize/api/yml/v1/ReturnedItemType.yml
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\ReturnedItemType:
             accessor:
                 getter: getDateUTC
                 setter: setDateUTC
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         dateLocal:
             expose: true
             access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\ReturnedItemType:
             accessor:
                 getter: getDateLocal
                 setter: setDateLocal
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         code:
             expose: true
             access_type: public_method

diff --git a/lib/net/authorize/api/yml/v1/SubscriptionDetailType.yml b/lib/net/authorize/api/yml/v1/SubscriptionDetailType.yml
@@ -39,7 +39,7 @@ net\authorize\api\contract\v1\SubscriptionDetailType:
             accessor:
                 getter: getCreateTimeStampUTC
                 setter: setCreateTimeStampUTC
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         firstName:
             expose: true
             access_type: public_method

diff --git a/lib/net/authorize/api/yml/v1/TransactionDetailsType.yml b/lib/net/authorize/api/yml/v1/TransactionDetailsType.yml
@@ -39,7 +39,7 @@ net\authorize\api\contract\v1\TransactionDetailsType:
             accessor:
                 getter: getSubmitTimeUTC
                 setter: setSubmitTimeUTC
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         submitTimeLocal:
             expose: true
             access_type: public_method
@@ -49,7 +49,7 @@ net\authorize\api\contract\v1\TransactionDetailsType:
             accessor:
                 getter: getSubmitTimeLocal
                 setter: setSubmitTimeLocal
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         transactionType:
             expose: true
             access_type: public_method

diff --git a/lib/net/authorize/api/yml/v1/TransactionSummaryType.yml b/lib/net/authorize/api/yml/v1/TransactionSummaryType.yml
@@ -19,7 +19,7 @@ net\authorize\api\contract\v1\TransactionSummaryType:
             accessor:
                 getter: getSubmitTimeUTC
                 setter: setSubmitTimeUTC
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         submitTimeLocal:
             expose: true
             access_type: public_method
@@ -29,7 +29,7 @@ net\authorize\api\contract\v1\TransactionSummaryType:
             accessor:
                 getter: getSubmitTimeLocal
                 setter: setSubmitTimeLocal
-            type: Goetas\Xsd\XsdToPhp\XMLSchema\DateTime
+            type: GoetasWebservices\Xsd\XsdToPhp\XMLSchema\DateTime
         transactionStatus:
             expose: true
             access_type: public_method

diff --git a/tests/AuthorizeNetAIM_Test.php b/tests/AuthorizeNetAIM_Test.php
@@ -484,7 +484,7 @@ public function testAuthCaptureCustomFields()
         $sale = new AuthorizeNetAIM;
         $sale->setFields(
             array(
-            'amount' => rand(1, 1000),
+            'amount' => rand(1, 90000),
             'card_num' => '6011000000000012',
             'exp_date' => '0420'
             )

diff --git a/tests/AuthorizeNetCIM_Test.php b/tests/AuthorizeNetCIM_Test.php
@@ -5,6 +5,7 @@ class AuthorizeNetCIM_Test extends PHPUnit_Framework_TestCase
 
   public function testDeleteAllCustomerProfiles()
   {
+    $this->markTestSkipped('This test was taking much too long, need to revisit BM 20160615'); //TODO
     $request = new AuthorizeNetCIM;
     $response = $request->getCustomerProfileIds();
     $customers = $response->getCustomerProfileIds();