Merge pull request #14 from splitfire-agency/feat/add-config-server-s…

…electore Added config paybox.load_uri
splitfire-agency · Sep 4, 2023 · 6e6df4e · 6e6df4e
2 parents f5108f8 + 4a85f46
commit 6e6df4e
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 6 deletions.
diff --git a/config/paybox.php b/config/paybox.php
@@ -109,6 +109,11 @@
    */
   "transaction_verify_route_name" => "paybox.process",
 
+  /*
+   * Load uri (not url) for testing server selector
+   */
+  "load_uri" => "load.html",
+
   /*
    * Access urls for Paybox for production environment
    */

diff --git a/src/Services/Billing.php b/src/Services/Billing.php
@@ -322,15 +322,30 @@ public function getXml(): string
       '<?xml version="1.0" encoding="utf-8"?><Billing><Address></Address></Billing>'
     );
     if ($this->companyName) {
-      $dom->Address->addChild("CompanyName", htmlspecialchars($this->companyName));
+      $dom->Address->addChild(
+        "CompanyName",
+        htmlspecialchars($this->companyName)
+      );
     }
-    $dom->Address->addChild("FirstName", htmlspecialchars($this->firstName ?? "xxx"));
-    $dom->Address->addChild("LastName", htmlspecialchars($this->lastName ?? "xxx"));
-    $dom->Address->addChild("Address1", htmlspecialchars($this->address1 ?? "xxx"));
+    $dom->Address->addChild(
+      "FirstName",
+      htmlspecialchars($this->firstName ?? "xxx")
+    );
+    $dom->Address->addChild(
+      "LastName",
+      htmlspecialchars($this->lastName ?? "xxx")
+    );
+    $dom->Address->addChild(
+      "Address1",
+      htmlspecialchars($this->address1 ?? "xxx")
+    );
     if ($this->address2) {
       $dom->Address->addChild("Address2", htmlspecialchars($this->address2));
     }
-    $dom->Address->addChild("ZipCode", htmlspecialchars($this->zipcode ?? "xxx"));
+    $dom->Address->addChild(
+      "ZipCode",
+      htmlspecialchars($this->zipcode ?? "xxx")
+    );
     $dom->Address->addChild("City", htmlspecialchars($this->city ?? "xxx"));
     $dom->Address->addChild("CountryCode", $this->countryCode ?? 250);
 

diff --git a/src/Services/ServerSelector.php b/src/Services/ServerSelector.php
@@ -38,7 +38,12 @@ public function find($type)
 
     foreach ($servers as $key => $server) {
       $doc = $this->getDocumentLoader();
-      $doc->loadHTMLFile("https://" . $server . "/load.html");
+      $doc->loadHTMLFile(
+        "https://" .
+          $server .
+          "/" .
+          ltrim($this->config->get("paybox.load_uri", "load.html"), "/")
+      );
       $element = $doc->getElementById("server_status");
       if ($element && $element->textContent == "OK") {
         return $urls[$key];

diff --git a/tests/Providers/PayboxServiceProviderTest.php b/tests/Providers/PayboxServiceProviderTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Providers;
 
+use Illuminate\Config\Repository as Config;
 use Sf\PayboxGateway\Providers\PayboxServiceProvider;
 use Illuminate\Foundation\Application;
 use Mockery;

diff --git a/tests/Services/ServerSelectorTest.php b/tests/Services/ServerSelectorTest.php
@@ -46,6 +46,11 @@ public function testFindValidServerForPayboxWhenTestIsOnAnd1stServerIsFine()
       ->with("paybox.test_urls.paybox")
       ->once()
       ->andReturn($urls);
+    $config
+      ->shouldReceive("get")
+      ->with("paybox.load_uri", "load.html")
+      ->once()
+      ->andReturn("load.html");
 
     $serverSelector
       ->shouldReceive("getDocumentLoader")
@@ -93,6 +98,11 @@ public function testReturnValidServerForPayboxWhenTestIsOffAnd1stServerIsFine()
       ->with("paybox.production_urls.paybox")
       ->once()
       ->andReturn($urls);
+    $config
+      ->shouldReceive("get")
+      ->with("paybox.load_uri", "load.html")
+      ->once()
+      ->andReturn("load.html");
 
     $serverSelector
       ->shouldReceive("getDocumentLoader")
@@ -143,6 +153,11 @@ public function testFindValidServerForPayboxWhenTestIsOffAnd1stServerIsDown()
       ->with("paybox.production_urls.paybox")
       ->once()
       ->andReturn($urls);
+    $config
+      ->shouldReceive("get")
+      ->with("paybox.load_uri", "load.html")
+      ->twice()
+      ->andReturn("load.html");
 
     $serverSelector
       ->shouldReceive("getDocumentLoader")
@@ -203,6 +218,11 @@ public function testThrowsExceptionWhenTestIsOffAndAllServersAreDown()
       ->with("paybox.production_urls.paybox")
       ->once()
       ->andReturn($urls);
+    $config
+      ->shouldReceive("get")
+      ->with("paybox.load_uri", "load.html")
+      ->twice()
+      ->andReturn("load.html");
 
     $serverSelector
       ->shouldReceive("getDocumentLoader")