PW-614: Provide a code for errors thrown by Curl (#79)

* PW-614: Provide a code for errors thrown by Curl * PW-614: added empty line at the end of file * PW-614: Updated mocktests for curl errors * PW-614: Remove if check, since an errno is always passed
Adyen · Oct 18, 2018 · d063e51 · d063e51
1 parent dc43ff5
commit d063e51
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 6 deletions.
diff --git a/src/Adyen/HttpClient/CurlClient.php b/src/Adyen/HttpClient/CurlClient.php
@@ -222,7 +222,7 @@ protected function handleCurlError($url, $errno, $message, $logger)
         }
         $msg .= "\n(Network error [errno $errno]: $message)";
         $logger->error($msg);
-        throw new \Adyen\ConnectionException($msg);
+        throw new \Adyen\ConnectionException($msg, $errno);
     }
 
     /**

diff --git a/tests/MockTest/PaymentTest.php b/tests/MockTest/PaymentTest.php
@@ -107,9 +107,7 @@ public function testAuthoriseConnectionFailure($jsonFile, $httpStatus, $errno, $
         } catch (\Exception $e) {
             $this->assertInstanceOf('Adyen\ConnectionException', $e);
             $this->assertContains($expectedExceptionMessage, $e->getMessage());
-            if ($httpStatus != null) {
-                $this->assertEquals($httpStatus, $e->getCode());
-            }
+            $this->assertEquals($errno, $e->getCode());
         }
     }
 
@@ -173,4 +171,4 @@ public static function resultFailureAuthoriseProvider()
             array('tests/Resources/Payment/invalid-merchant-account.json', 403, "Invalid Merchant Account")
         );
     }
-}
+}
diff --git a/tests/PosPaymentTest.php b/tests/PosPaymentTest.php
@@ -187,4 +187,68 @@ public function testCreatePosEMVRefundSuccess()
 
     }
 
-}
+    /**
+     * After timeout, an Exception will be returned with code: CURLE_OPERATION_TIMEOUTED
+     * @covers \Adyen\HttpClient\CurlClient::handleCurlError
+     */
+    public function testPosPaymentFailTimeout()
+    {
+        // initialize client
+        $client = $this->createTerminalCloudAPIClient();
+        $client->setTimeout(1);
+
+        // initialize service
+        $service = new Service\PosPayment($client);
+
+        //Construct request
+        $transactionType = \Adyen\TransactionType::NORMAL;
+        $serviceID = date("dHis");
+        $timeStamper = date("Y-m-d") . "T" . date("H:i:s+00:00");
+
+        $json = '{
+                    "SaleToPOIRequest": {
+                        "MessageHeader": {
+                            "MessageType": "Request",
+                            "MessageClass": "Service",
+                            "MessageCategory": "Payment",
+                            "SaleID": "PosTestLibrary",
+                            "POIID": "' . $this->getPOIID() . '",
+                            "ProtocolVersion": "3.0",
+                            "ServiceID": "' . $serviceID . '"
+                        },
+                        "PaymentRequest": {
+                            "SaleData": {
+                                "SaleTransactionID": {
+                                    "TransactionID": "POStimeout",
+                                    "TimeStamp": "' . $timeStamper . '"
+                                },
+                                "TokenRequestedType": "Customer",
+                                "SaleReferenceID": "SalesRefABC"
+                            },
+                            "PaymentTransaction": {
+                                "AmountsReq": {
+                                    "Currency": "EUR",
+                                    "RequestedAmount": ' . 14.91 . '
+                                }
+                            },
+                            "PaymentData": {
+                                "PaymentType": "' . $transactionType . '"
+                            }
+                        }
+                    }
+                }
+            ';
+
+        $params = json_decode($json, true); //Create associative array for passing along
+
+        try {
+            $result = $service->runTenderSync($params);
+            $this->fail();
+        } catch (\Exception $e) {
+            $this->assertEquals(CURLE_OPERATION_TIMEOUTED, $e->getCode());
+            $this->validateApiPermission($e);
+        }
+
+    }
+
+}