Merge pull request #16 from dpdconnect/1.1.8

1.1.8

Author: dpdplugin

composer.json

@@ -29,6 +29,7 @@
     "ext-json": "*"
   },
   "require-dev": {
+    "phpunit/phpunit": "~6.5.0",
     "symfony/yaml": "^4.2",
     "donatj/mock-webserver": "^2.0",
     "overtrue/phplint": "^1.1",

src/ClientBuilder.php

@@ -36,7 +36,7 @@ class ClientBuilder implements ClientBuilderInterface
      */
     public function __construct($endpoint = null, $meta = null)
     {
-        $this->endpoint = 1 === preg_match('#((https?)://(\S*?\.\S*?))([\s)\[\]{},;"\':<]|\.\s|$)#i', $endpoint) ? $endpoint : Client::ENDPOINT;
+        $this->endpoint = 1 === preg_match('#((https?)://(\S*?\.\S*?))([\s)\[\]{},;"\':<]|\.\s|$)#i', $endpoint ?: '') ? $endpoint : Client::ENDPOINT;
         $this->meta = $meta;
     }
 

src/Common/ResponseError.php

@@ -117,6 +117,7 @@ public function getErrorString()
     /**
      * @return string[]
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $properties = get_object_vars($this);

src/Objects/BaseObject.php

@@ -46,6 +46,7 @@ public function loadFromArray($object)
     /**
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         $properties = get_object_vars($this);