Optimized memory usage.

Author: andrew-svirin

src/Builders/Request/BodyBuilder.php

@@ -5,6 +5,8 @@
 use Closure;
 use DOMDocument;
 use DOMElement;
+use EbicsApi\Ebics\Services\CryptService;
+use EbicsApi\Ebics\Services\ZipService;
 
 /**
  * Class BodyBuilder builder for request container.
@@ -14,11 +16,15 @@
  */
 abstract class BodyBuilder
 {
+    protected ZipService $zipService;
+    protected CryptService $cryptService;
     protected DOMElement $instance;
     protected ?DOMDocument $dom;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(ZipService $zipService, CryptService $cryptService, ?DOMDocument $dom = null)
     {
+        $this->zipService = $zipService;
+        $this->cryptService = $cryptService;
         $this->dom = $dom;
     }
 

src/Builders/Request/BodyBuilderV2.php

@@ -14,7 +14,7 @@ final class BodyBuilderV2 extends BodyBuilder
 {
     public function addDataTransfer(Closure $callback): BodyBuilder
     {
-        $dataTransferBuilder = new DataTransferBuilderV2($this->dom);
+        $dataTransferBuilder = new DataTransferBuilderV2($this->zipService, $this->cryptService, $this->dom);
         $this->instance->appendChild($dataTransferBuilder->createInstance()->getInstance());
 
         call_user_func($callback, $dataTransferBuilder);

src/Builders/Request/BodyBuilderV3.php

@@ -14,7 +14,7 @@ final class BodyBuilderV3 extends BodyBuilder
 {
     public function addDataTransfer(Closure $callback): BodyBuilder
     {
-        $dataTransferBuilder = new DataTransferBuilderV3($this->dom);
+        $dataTransferBuilder = new DataTransferBuilderV3($this->zipService, $this->cryptService, $this->dom);
         $this->instance->appendChild($dataTransferBuilder->createInstance()->getInstance());
 
         call_user_func($callback, $dataTransferBuilder);

src/Builders/Request/DataEncryptionInfoBuilder.php

@@ -2,11 +2,11 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
+use DOMDocument;
+use DOMElement;
 use EbicsApi\Ebics\Exceptions\SignatureEbicsException;
 use EbicsApi\Ebics\Models\Keyring;
 use EbicsApi\Ebics\Services\CryptService;
-use DOMDocument;
-use DOMElement;
 
 /**
  * Class DataEncryptionInfoBuilder builder for request container.
@@ -20,10 +20,10 @@ final class DataEncryptionInfoBuilder
     private ?DOMDocument $dom;
     private CryptService $cryptService;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(CryptService $cryptService, ?DOMDocument $dom = null)
     {
+        $this->cryptService = $cryptService;
         $this->dom = $dom;
-        $this->cryptService = new CryptService();
     }
 
     /**

src/Builders/Request/DataTransferBuilder.php

@@ -2,12 +2,12 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
-use EbicsApi\Ebics\Contracts\SignatureDataInterface;
-use EbicsApi\Ebics\Services\CryptService;
-use EbicsApi\Ebics\Services\ZipService;
 use Closure;
 use DOMDocument;
 use DOMElement;
+use EbicsApi\Ebics\Contracts\SignatureDataInterface;
+use EbicsApi\Ebics\Services\CryptService;
+use EbicsApi\Ebics\Services\ZipService;
 
 /**
  * Class DataTransferBuilder builder for request container.
@@ -22,11 +22,11 @@ abstract class DataTransferBuilder
     protected ZipService $zipService;
     protected CryptService $cryptService;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(ZipService $zipService, CryptService $cryptService, ?DOMDocument $dom = null)
     {
         $this->dom = $dom;
-        $this->zipService = new ZipService();
-        $this->cryptService = new CryptService();
+        $this->zipService = $zipService;
+        $this->cryptService = $cryptService;
     }
 
     public function createInstance(): DataTransferBuilder
@@ -62,7 +62,7 @@ public function addOrderData(string $orderData = null, string $transactionKey =
 
     public function addDataEncryptionInfo(Closure $callable = null): DataTransferBuilder
     {
-        $dataEncryptionInfoBuilder = new DataEncryptionInfoBuilder($this->dom);
+        $dataEncryptionInfoBuilder = new DataEncryptionInfoBuilder($this->cryptService, $this->dom);
         $this->instance->appendChild($dataEncryptionInfoBuilder->createInstance()->getInstance());
 
         call_user_func($callable, $dataEncryptionInfoBuilder);

src/Builders/Request/HeaderBuilder.php

@@ -5,6 +5,7 @@
 use Closure;
 use DOMDocument;
 use DOMElement;
+use EbicsApi\Ebics\Services\CryptService;
 
 /**
  * Class HeaderBuilder builder for request container.
@@ -14,11 +15,13 @@
  */
 abstract class HeaderBuilder
 {
+    protected CryptService $cryptService;
     protected DOMElement $instance;
     protected ?DOMDocument $dom;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(CryptService $cryptService, ?DOMDocument $dom = null)
     {
+        $this->cryptService = $cryptService;
         $this->dom = $dom;
     }
 

src/Builders/Request/HeaderBuilderV2.php

@@ -14,7 +14,7 @@ final class HeaderBuilderV2 extends HeaderBuilder
 {
     public function addStatic(Closure $callback): HeaderBuilder
     {
-        $staticBuilder = new StaticBuilderV2($this->dom);
+        $staticBuilder = new StaticBuilderV2($this->cryptService, $this->dom);
         $this->instance->appendChild($staticBuilder->createInstance()->getInstance());
 
         call_user_func($callback, $staticBuilder);

src/Builders/Request/HeaderBuilderV3.php

@@ -14,7 +14,7 @@ final class HeaderBuilderV3 extends HeaderBuilder
 {
     public function addStatic(Closure $callback): HeaderBuilder
     {
-        $staticBuilder = new StaticBuilderV3($this->dom);
+        $staticBuilder = new StaticBuilderV3($this->cryptService, $this->dom);
         $this->instance->appendChild($staticBuilder->createInstance()->getInstance());
 
         call_user_func($callback, $staticBuilder);

src/Builders/Request/StaticBuilder.php

@@ -2,11 +2,11 @@
 
 namespace EbicsApi\Ebics\Builders\Request;
 
-use EbicsApi\Ebics\Services\CryptService;
 use Closure;
 use DateTimeInterface;
 use DOMDocument;
 use DOMElement;
+use EbicsApi\Ebics\Services\CryptService;
 
 /**
  * Class StaticBuilder builder for request container.
@@ -24,10 +24,10 @@ abstract class StaticBuilder
     protected ?DOMDocument $dom;
     protected CryptService $cryptService;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(CryptService $cryptService, ?DOMDocument $dom = null)
     {
+        $this->cryptService = $cryptService;
         $this->dom = $dom;
-        $this->cryptService = new CryptService();
     }
 
     /**

src/Builders/Request/XmlBuilder.php

@@ -5,6 +5,8 @@
 use Closure;
 use DOMDocument;
 use DOMElement;
+use EbicsApi\Ebics\Services\CryptService;
+use EbicsApi\Ebics\Services\ZipService;
 
 /**
  * Class XmlBuilder builder for request container.
@@ -20,11 +22,15 @@ abstract class XmlBuilder
     private const EBICS_NO_PUB_KEY_DIGESTS = 'ebicsNoPubKeyDigestsRequest';
     private const EBICS_HEV = 'ebicsHEVRequest';
 
+    protected ZipService $zipService;
+    protected CryptService $cryptService;
     protected DOMElement $instance;
     protected ?DOMDocument $dom;
 
-    public function __construct(?DOMDocument $dom = null)
+    public function __construct(ZipService $zipService, CryptService $cryptService, ?DOMDocument $dom = null)
     {
+        $this->zipService = $zipService;
+        $this->cryptService = $cryptService;
         $this->dom = $dom;
     }