Merge pull request php-curl-class#519 from zachborboa/master

Fix failure tests erroring with mismatching error codes

Author: zachborboa

tests/PHPCurlClass/Helper.php

@@ -7,7 +7,7 @@
 class Test
 {
     const TEST_URL = 'http://127.0.0.1:8000/';
-    const ERROR_URL = 'https://1.2.3.4/';
+    const ERROR_URL = 'http://1.2.3.4/';
 
     public function __construct()
     {

tests/PHPCurlClass/PHPCurlClassTest.php

@@ -1103,12 +1103,12 @@ public function testTimeout()
     public function testError()
     {
         $test = new Test();
-        $test->curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 4000);
         $test->curl->get(Test::ERROR_URL);
         $this->assertTrue($test->curl->error);
         $this->assertTrue($test->curl->curlError);
-        $this->assertEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->errorCode);
-        $this->assertEquals(CURLE_OPERATION_TIMEOUTED, $test->curl->curlErrorCode);
+        $possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED);
+        $this->assertTrue(in_array($test->curl->errorCode, $possible_errors, true));
+        $this->assertTrue(in_array($test->curl->curlErrorCode, $possible_errors, true));
     }
 
     public function testErrorMessage()

tests/PHPCurlClass/PHPMultiCurlClassTest.php

@@ -601,8 +601,9 @@ public function testMultiCurlCallbackError()
             \PHPUnit\Framework\Assert::assertTrue($instance->error);
             \PHPUnit\Framework\Assert::assertTrue($instance->curlError);
             \PHPUnit\Framework\Assert::assertFalse($instance->httpError);
-            \PHPUnit\Framework\Assert::assertEquals(CURLE_OPERATION_TIMEOUTED, $instance->errorCode);
-            \PHPUnit\Framework\Assert::assertEquals(CURLE_OPERATION_TIMEOUTED, $instance->curlErrorCode);
+            $possible_errors = array(CURLE_SEND_ERROR, CURLE_OPERATION_TIMEOUTED);
+            \PHPUnit\Framework\Assert::assertTrue(in_array($instance->errorCode, $possible_errors, true));
+            \PHPUnit\Framework\Assert::assertTrue(in_array($instance->curlErrorCode, $possible_errors, true));
         });
 
         $multi_curl->addDelete(Test::ERROR_URL);