Optimized upload transaction.

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## 2.4
 
+* Optimized upload transaction.
+* Fix decryption for data.
 * Optimized memory usage.
 
 ## 2.3

src/Builders/CustomerCreditTransfer/CustomerCreditTransferBuilder.php

@@ -2,13 +2,13 @@
 
 namespace EbicsApi\Ebics\Builders\CustomerCreditTransfer;
 
+use DateTime;
+use DOMElement;
 use EbicsApi\Ebics\Contracts\PostalAddressInterface;
 use EbicsApi\Ebics\Handlers\Traits\XPathTrait;
 use EbicsApi\Ebics\Models\CustomerCreditTransfer;
 use EbicsApi\Ebics\Services\DOMHelper;
 use EbicsApi\Ebics\Services\RandomService;
-use DateTime;
-use DOMElement;
 use InvalidArgumentException;
 
 /**

src/Builders/CustomerCreditTransfer/CustomerInstantCreditTransferBuilder.php

@@ -2,11 +2,11 @@
 
 namespace EbicsApi\Ebics\Builders\CustomerCreditTransfer;
 
+use DateTime;
 use EbicsApi\Ebics\Handlers\Traits\XPathTrait;
 use EbicsApi\Ebics\Models\CustomerCreditTransfer;
 use EbicsApi\Ebics\Services\DOMHelper;
 use EbicsApi\Ebics\Services\RandomService;
-use DateTime;
 
 /**
  * Class CustomerInstantCreditTransferBuilder builder for model

src/Builders/CustomerCreditTransfer/CustomerSwissCreditTransferBuilder.php

@@ -2,13 +2,13 @@
 
 namespace EbicsApi\Ebics\Builders\CustomerCreditTransfer;
 
+use DateTime;
+use DOMElement;
 use EbicsApi\Ebics\Contracts\PostalAddressInterface;
 use EbicsApi\Ebics\Handlers\Traits\XPathTrait;
 use EbicsApi\Ebics\Models\CustomerCreditTransfer;
 use EbicsApi\Ebics\Services\DOMHelper;
 use EbicsApi\Ebics\Services\RandomService;
-use DateTime;
-use DOMElement;
 use InvalidArgumentException;
 
 /**

src/Builders/CustomerDirectDebit/CustomerDirectDebitBuilder.php

@@ -2,11 +2,11 @@
 
 namespace EbicsApi\Ebics\Builders\CustomerDirectDebit;
 
+use DateTime;
 use EbicsApi\Ebics\Handlers\Traits\XPathTrait;
 use EbicsApi\Ebics\Models\CustomerDirectDebit;
 use EbicsApi\Ebics\Services\DOMHelper;
 use EbicsApi\Ebics\Services\RandomService;
-use DateTime;
 
 /**
  * Class CustomerDirectDebitBuilder builder for model @see \EbicsApi\Ebics\Models\CustomerDirectDebit

src/Builders/Request/OrderDetailsBuilder.php

@@ -2,16 +2,16 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
+use DateTimeInterface;
+use DOMDocument;
+use DOMElement;
 use EbicsApi\Ebics\Contexts\BTDContext;
 use EbicsApi\Ebics\Contexts\BTUContext;
 use EbicsApi\Ebics\Contexts\FDLContext;
 use EbicsApi\Ebics\Contexts\FULContext;
 use EbicsApi\Ebics\Contexts\HVDContext;
 use EbicsApi\Ebics\Contexts\HVEContext;
 use EbicsApi\Ebics\Contexts\HVTContext;
-use DateTimeInterface;
-use DOMDocument;
-use DOMElement;
 
 /**
  * Abstract Class OrderDetailsBuilder builder for request container.

src/Builders/Request/OrderDetailsBuilderV2.php

@@ -2,12 +2,12 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
+use DateTimeInterface;
 use EbicsApi\Ebics\Contexts\BTDContext;
 use EbicsApi\Ebics\Contexts\BTUContext;
 use EbicsApi\Ebics\Contexts\HVDContext;
 use EbicsApi\Ebics\Contexts\HVEContext;
 use EbicsApi\Ebics\Contexts\HVTContext;
-use DateTimeInterface;
 use LogicException;
 
 /**

src/Builders/Request/OrderDetailsBuilderV3.php

@@ -2,12 +2,12 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
+use DateTimeInterface;
 use EbicsApi\Ebics\Contexts\BTDContext;
 use EbicsApi\Ebics\Contexts\BTUContext;
 use EbicsApi\Ebics\Contexts\HVDContext;
 use EbicsApi\Ebics\Contexts\HVEContext;
 use EbicsApi\Ebics\Contexts\HVTContext;
-use DateTimeInterface;
 use LogicException;
 
 /**

src/Builders/Request/RequestBuilder.php

@@ -2,8 +2,8 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
-use EbicsApi\Ebics\Models\Http\Request;
 use Closure;
+use EbicsApi\Ebics\Models\Http\Request;
 
 /**
  * Class RequestBuilder builder for model @see \EbicsApi\Ebics\Models\Http\Request

src/Contexts/RequestContext.php

@@ -2,13 +2,12 @@
 
 namespace EbicsApi\Ebics\Contexts;
 
+use DateTime;
+use DateTimeInterface;
 use EbicsApi\Ebics\Contracts\SignatureDataInterface;
 use EbicsApi\Ebics\Models\Bank;
 use EbicsApi\Ebics\Models\Keyring;
 use EbicsApi\Ebics\Models\User;
-use DateTime;
-use DateTimeInterface;
-use LogicException;
 
 /**
  * Class RequestContext context container for @see \EbicsApi\Ebics\Factories\RequestFactory

src/Contracts/EbicsClientInterface.php

@@ -2,6 +2,7 @@
 
 namespace EbicsApi\Ebics\Contracts;
 
+use DateTimeInterface;
 use EbicsApi\Ebics\Contexts\BTDContext;
 use EbicsApi\Ebics\Contexts\BTUContext;
 use EbicsApi\Ebics\Contexts\FDLContext;
@@ -18,7 +19,6 @@
 use EbicsApi\Ebics\Models\Keyring;
 use EbicsApi\Ebics\Models\UploadOrderResult;
 use EbicsApi\Ebics\Models\User;
-use DateTimeInterface;
 
 /**
  * EBICS client representation.

src/EbicsClient.php

@@ -273,9 +273,10 @@ public function SPR(RequestContext $context = null): UploadOrderResult
         $context = $this->requestFactory->prepareStandardContext($context);
         $context->setOnlyES(true);
 
-        $transaction = $this->uploadESTransaction(
+        $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($context) {
                 $transaction->setOrderData(' ');
+                $transaction->setNumSegments(0);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createSPR($transaction, $context);
@@ -629,6 +630,7 @@ public function BTU(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createBTU($transaction, $context);
@@ -678,6 +680,7 @@ public function FUL(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createFUL($transaction, $context);
@@ -700,6 +703,7 @@ public function CCT(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createCCT($transaction, $context);
@@ -722,6 +726,7 @@ public function CDD(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createCDD($transaction, $context);
@@ -744,6 +749,7 @@ public function CDB(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createCDB($transaction, $context);
@@ -766,6 +772,7 @@ public function CIP(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createCIP($transaction, $context);
@@ -788,6 +795,7 @@ public function XE2(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createXE2($transaction, $context);
@@ -810,6 +818,7 @@ public function XE3(
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createXE3($transaction, $context);
@@ -830,6 +839,7 @@ public function YCT(OrderDataInterface $orderData, RequestContext $context = nul
         $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($orderData, $context) {
                 $transaction->setOrderData($orderData->getContent());
+                $transaction->setNumSegments(1);
                 $transaction->setDigest($this->cryptService->hash($transaction->getOrderData()));
 
                 return $this->requestFactory->createYCT($transaction, $context);
@@ -881,9 +891,10 @@ public function HVE(HVEContext $hveContext, RequestContext $context = null): Upl
     {
         $context = $this->requestFactory->prepareStandardContext($context)
             ->setHVEContext($hveContext);
-        $transaction = $this->uploadESTransaction(
+        $transaction = $this->uploadTransaction(
             function (UploadTransaction $transaction) use ($context) {
                 $transaction->setDigest($context->getHVEContext()->getDigest());
+                $transaction->setNumSegments(0);
 
                 return $this->requestFactory->createHVE($transaction, $context);
             }
@@ -1140,11 +1151,10 @@ private function retrieveDownloadSegment(Request $request): DownloadSegment
      * @throws EbicsResponseException
      * @throws IncorrectResponseEbicsException
      */
-    private function uploadESTransaction(callable $requestClosure): UploadTransaction
+    private function uploadTransaction(callable $requestClosure): UploadTransaction
     {
         $transaction = $this->transactionFactory->createUploadTransaction();
         $transaction->setKey($this->cryptService->generateTransactionKey());
-        $transaction->setNumSegments(0);
 
         $request = call_user_func_array($requestClosure, [$transaction]);
 
@@ -1159,7 +1169,7 @@ private function uploadESTransaction(callable $requestClosure): UploadTransactio
         $segment->setSegmentNumber(1);
         $segment->setIsLastSegment(true);
         $segment->setNumSegments($transaction->getNumSegments());
-        $segment->setOrderData(' ');
+        $segment->setOrderData($transaction->getOrderData());
         $segment->setTransactionId($transaction->getInitialization()->getTransactionId());
 
         if ($segment->getTransactionId()) {
@@ -1171,40 +1181,6 @@ private function uploadESTransaction(callable $requestClosure): UploadTransactio
         return $transaction;
     }
 
-    /**
-     * @throws EbicsException
-     * @throws EbicsResponseException
-     * @throws IncorrectResponseEbicsException
-     */
-    private function uploadTransaction(callable $requestClosure): UploadTransaction
-    {
-        $transaction = $this->transactionFactory->createUploadTransaction();
-        $transaction->setKey($this->cryptService->generateTransactionKey());
-        $transaction->setNumSegments(1);
-
-        $request = call_user_func_array($requestClosure, [$transaction]);
-
-        $response = $this->httpClient->post($this->bank->getUrl(), $request);
-        $this->checkH00XReturnCode($request, $response);
-
-        $uploadSegment = $this->responseHandler->extractUploadSegment($request, $response);
-        $transaction->setInitialization($uploadSegment);
-
-        $segment = $this->segmentFactory->createTransferSegment();
-        $segment->setTransactionKey($transaction->getKey());
-        $segment->setSegmentNumber(1);
-        $segment->setIsLastSegment(true);
-        $segment->setNumSegments($transaction->getNumSegments());
-        $segment->setOrderData($transaction->getOrderData());
-        $segment->setTransactionId($transaction->getInitialization()->getTransactionId());
-        $transaction->addSegment($segment);
-        $transaction->setKey($transaction->getInitialization()->getTransactionId());
-
-        $this->transferTransfer($transaction);
-
-        return $transaction;
-    }
-
     private function createInitializationOrderResult(InitializationTransaction $transaction): InitializationOrderResult
     {
         $orderResult = $this->orderResultFactory->createInitializationOrderResult();
@@ -1342,9 +1318,10 @@ private function getUserSignature(string $type): SignatureInterface
      * Create new signature.
      *
      * @param string $type
+     * @param array|null $details
      *
      * @return SignatureInterface
-     * @throws EbicsException
+     * @throws PasswordEbicsException
      */
     private function createUserSignature(string $type, array $details = null): SignatureInterface
     {

src/Handlers/OrderDataHandlerV2.php

@@ -2,18 +2,18 @@
 
 namespace EbicsApi\Ebics\Handlers;
 
+use DateTimeInterface;
+use DOMDocument;
+use DOMElement;
+use DOMNode;
+use DOMNodeList;
 use EbicsApi\Ebics\Contracts\SignatureInterface;
 use EbicsApi\Ebics\Handlers\Traits\H00XTrait;
 use EbicsApi\Ebics\Models\Crypt\X509;
 use EbicsApi\Ebics\Models\CustomerHIA;
 use EbicsApi\Ebics\Models\CustomerINI;
 use EbicsApi\Ebics\Models\Document;
 use EbicsApi\Ebics\Services\DOMHelper;
-use DateTimeInterface;
-use DOMDocument;
-use DOMElement;
-use DOMNode;
-use DOMNodeList;
 
 /**
  * Ebics 2.x OrderDataHandler.

src/Handlers/OrderDataHandlerV30.php

@@ -2,15 +2,15 @@
 
 namespace EbicsApi\Ebics\Handlers;
 
+use DateTimeInterface;
+use DOMElement;
 use EbicsApi\Ebics\Contracts\SignatureInterface;
 use EbicsApi\Ebics\Handlers\Traits\H005Trait;
 use EbicsApi\Ebics\Models\Crypt\X509;
 use EbicsApi\Ebics\Models\CustomerHIA;
 use EbicsApi\Ebics\Models\CustomerINI;
 use EbicsApi\Ebics\Models\Document;
 use EbicsApi\Ebics\Services\DOMHelper;
-use DateTimeInterface;
-use DOMElement;
 use RuntimeException;
 
 /**

src/Handlers/Traits/C14NTrait.php

@@ -2,10 +2,10 @@
 
 namespace EbicsApi\Ebics\Handlers\Traits;
 
-use EbicsApi\Ebics\Exceptions\AlgoEbicsException;
 use DOMNode;
 use DOMNodeList;
 use DOMXPath;
+use EbicsApi\Ebics\Exceptions\AlgoEbicsException;
 
 /**
  * Class C14NTrait manage c14n building.

src/Models/CertificateX509.php

@@ -2,8 +2,8 @@
 
 namespace EbicsApi\Ebics\Models;
 
-use EbicsApi\Ebics\Models\Crypt\X509;
 use DateTime;
+use EbicsApi\Ebics\Models\Crypt\X509;
 
 /**
  * Class CertificateX509 represents Certificate model in X509 structure.