deploymentMode for Message

FriendsOfCXML · Apr 7, 2024 · ce272d4 · ce272d4
1 parent 3caf0a5
commit ce272d4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/CXml/Model/CXml.php b/src/CXml/Model/CXml.php
@@ -12,6 +12,10 @@
  */
 class CXml
 {
+
+    public const DEPLOYMENT_TEST = 'test';
+    public const DEPLOYMENT_PROD = 'production';
+
     /**
      * @Ser\XmlAttribute(namespace="http://www.w3.org/XML/1998/namespace")
      */

diff --git a/src/CXml/Model/Message/Message.php b/src/CXml/Model/Message/Message.php
@@ -2,6 +2,8 @@
 
 namespace CXml\Model\Message;
 
+use Assert\Assertion;
+use CXml\Model\CXml;
 use CXml\Model\Status;
 use JMS\Serializer\Annotation as Ser;
 
@@ -40,9 +42,13 @@ public function __construct(
         MessagePayloadInterface $message,
         Status $status = null,
         string $id = null,
-        string $deploymentMode = null,
-        string $inReplyTo = null
+        string $inReplyTo = null,
+        string $deploymentMode = null
     ) {
+        if (null !== $deploymentMode) {
+            Assertion::inArray($deploymentMode, [CXml::DEPLOYMENT_PROD, CXml::DEPLOYMENT_TEST]);
+        }
+
         $this->status = $status;
         $this->payload = $message;
         $this->deploymentMode = $deploymentMode;

diff --git a/src/CXml/Model/Request/Request.php b/src/CXml/Model/Request/Request.php
@@ -3,13 +3,12 @@
 namespace CXml\Model\Request;
 
 use Assert\Assertion;
+use CXml\Model\CXml;
 use CXml\Model\Status;
 use JMS\Serializer\Annotation as Ser;
 
 class Request
 {
-    public const DEPLOYMENT_TEST = 'test';
-    public const DEPLOYMENT_PROD = 'production';
 
     /**
      * @Ser\SerializedName("Status")
@@ -41,7 +40,7 @@ public function __construct(
         string $deploymentMode = null
     ) {
         if (null !== $deploymentMode) {
-            Assertion::inArray($deploymentMode, [self::DEPLOYMENT_PROD, self::DEPLOYMENT_TEST]);
+            Assertion::inArray($deploymentMode, [CXml::DEPLOYMENT_PROD, CXml::DEPLOYMENT_TEST]);
         }
 
         $this->status = $status;

diff --git a/tests/CXmlTest/Model/OrderRequestTest.php b/tests/CXmlTest/Model/OrderRequestTest.php
@@ -10,6 +10,7 @@
 use CXml\Model\Country;
 use CXml\Model\CountryCode;
 use CXml\Model\Credential;
+use CXml\Model\CXml;
 use CXml\Model\Description;
 use CXml\Model\ItemDetail;
 use CXml\Model\ItemId;
@@ -21,7 +22,6 @@
 use CXml\Model\PostalAddress;
 use CXml\Model\Request\OrderRequest;
 use CXml\Model\Request\OrderRequestHeader;
-use CXml\Model\Request\Request;
 use CXml\Model\ShipTo;
 use CXml\Model\TelephoneNumber;
 use CXml\Payload\PayloadIdentityFactoryInterface;
@@ -174,7 +174,7 @@ public function testMinimumExample(): void
             ->to($to)
             ->sender($sender)
             ->payload($orderRequest)
-            ->build(Request::DEPLOYMENT_TEST)
+            ->build(CXml::DEPLOYMENT_TEST)
         ;
 
         $this->assertEquals('OrderRequest_1625586002.193314.7293@dev', (string) $cxml);