update v 1.0.7.5

vendor/maxmind/web-service-common/src/WebService/Http/CurlRequest.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace MaxMind\WebService\Http;
+
+use MaxMind\Exception\HttpException;
+
+/**
+ * This class is for internal use only. Semantic versioning does not not apply.
+ * @package MaxMind\WebService\Http
+ * @internal
+ */
+class CurlRequest implements Request
+{
+    private $url;
+    private $options;
+
+    /**
+     * @param $url
+     * @param $options
+     */
+    public function __construct($url, $options)
+    {
+        $this->url = $url;
+        $this->options = $options;
+    }
+
+    /**
+     * @param $body
+     * @return array
+     */
+    public function post($body)
+    {
+        $curl = $this->createCurl();
+
+        curl_setopt($curl, CURLOPT_POST, true);
+        curl_setopt($curl, CURLOPT_POSTFIELDS, $body);
+
+        return $this->execute($curl);
+    }
+
+    public function get()
+    {
+        $curl = $this->createCurl();
+
+        curl_setopt($curl, CURLOPT_HTTPGET, true);
+
+        return $this->execute($curl);
+    }
+
+    /**
+     * @return resource
+     */
+    private function createCurl()
+    {
+        $curl = curl_init($this->url);
+
+        $opts[CURLOPT_CAINFO] = $this->options['caBundle'];
+        $opts[CURLOPT_SSL_VERIFYHOST] = 2;
+        $opts[CURLOPT_FOLLOWLOCATION] = false;
+        $opts[CURLOPT_SSL_VERIFYPEER] = true;
+        $opts[CURLOPT_RETURNTRANSFER] = true;
+
+
+        $opts[CURLOPT_HTTPHEADER] = $this->options['headers'];
+        $opts[CURLOPT_USERAGENT] = $this->options['userAgent'];
+        $opts[CURLOPT_PROXY] = $this->options['proxy'];
+
+        // The defined()s are here as the *_MS opts are not available on older
+        // cURL versions
+        $connectTimeout = $this->options['connectTimeout'];
+        if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
+            $opts[CURLOPT_CONNECTTIMEOUT_MS] = ceil($connectTimeout * 1000);
+        } else {
+            $opts[CURLOPT_CONNECTTIMEOUT] = ceil($connectTimeout);
+        }
+
+        $timeout = $this->options['timeout'];
+        if (defined('CURLOPT_TIMEOUT_MS')) {
+            $opts[CURLOPT_TIMEOUT_MS] = ceil($timeout * 1000);
+        } else {
+            $opts[CURLOPT_TIMEOUT] = ceil($timeout);
+        }
+
+        curl_setopt_array($curl, $opts);
+        return $curl;
+    }
+
+    private function execute($curl)
+    {
+        $body = curl_exec($curl);
+        if ($errno = curl_errno($curl)) {
+            $errorMessage = curl_error($curl);
+
+            throw new HttpException(
+                "cURL error ({$errno}): {$errorMessage}",
+                0,
+                $this->url
+            );
+        }
+
+        $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+        $contentType = curl_getinfo($curl, CURLINFO_CONTENT_TYPE);
+        curl_close($curl);
+
+        return array($statusCode, $contentType, $body);
+    }
+}

vendor/maxmind/web-service-common/src/WebService/Http/Request.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace MaxMind\WebService\Http;
+
+/**
+ * Interface Request
+ * @package MaxMind\WebService\Http
+ * @internal
+ */
+interface Request
+{
+    /**
+     * @param $url
+     * @param $options
+     */
+    public function __construct($url, $options);
+
+    /**
+     * @param $body
+     * @return mixed
+     */
+    public function post($body);
+
+    /**
+     * @return mixed
+     */
+    public function get();
+}

vendor/maxmind/web-service-common/src/WebService/Http/RequestFactory.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace MaxMind\WebService\Http;
+
+/**
+ * Class RequestFactory
+ * @package MaxMind\WebService\Http
+ * @internal
+ */
+class RequestFactory
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * @param $url
+     * @param $options
+     * @return CurlRequest
+     */
+    public function request($url, $options)
+    {
+        return new CurlRequest($url, $options);
+    }
+}