Improved HTTP client / request options

CHANGELOG.md

@@ -4,6 +4,13 @@ All Notable changes to *jkphl/dom-factory* will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+
+## [0.1.1] - 2017-05-29
+
+### Added
+
+* Improved HTTP client / request options
+
 ## [0.1.0] - 2017-05-24
 
 Initial release

doc/index.md

@@ -30,13 +30,20 @@ $dom = Dom::createFromFile('/path/to/file.html');
 
 ```php
 use Jkphl\Domfactory\Ports\Dom;
-$dom = Dom::createFromUri('https://example.com/path/to/file.xml', ['timeout' => 30]);
+$dom = Dom::createFromUri('https://example.com/path/to/file.xml');
+
+// With HTTP client options
+$options = [
+    'client' => ['timeout' => 30],
+    'request' => ['verify' => false],
+];
+$dom = Dom::createFromUri('https://example.com/path/to/file.xml', $options);
 ```
 
-If the [cURL](http://php.net/manual/book.curl.php) PHP extension is available on your system the factory uses [Guzzle](http://docs.guzzlephp.org) to fetch the web resource — or fall back to a native `file_get_contents()` otherwise. Depending on the request mechanism, the second (array) parameter for `Dom::createFromUri()` will be used
+If the [cURL](http://php.net/manual/book.curl.php) PHP extension is available on your system the factory uses [Guzzle](http://docs.guzzlephp.org) to fetch the web resource or otherwise fall back to a native `file_get_contents()` strategy. Depending on the request mechanism, the second (array) parameter for `Dom::createFromUri()` will be used
 
-* as [Guzzle request options](http://docs.guzzlephp.org/en/latest/request-options.html) or
-* as `$options` for creating a PHP [stream context](http://php.net/manual/function.stream-context-create.php).
+* as Guzzle [client](http://docs.guzzlephp.org/en/latest/quickstart.html#creating-a-client) / [request options](http://docs.guzzlephp.org/en/latest/request-options.html) or
+* as `$options` for creating a PHP [stream context](http://php.net/manual/function.stream-context-create.php) (`client` key) respectively [setting its parameters](http://php.net/manual/en/function.stream-context-set-params.php) (`request` key).
 
 Please make sure to pass in a compatible set of options.
 

src/Domfactory/Infrastructure/Dom.php

@@ -63,8 +63,10 @@ protected static function createViaHttpClient($url, array $options = [])
     {
         try {
             $guzzleUrl = Url::factory($url);
-            $client = new Client($guzzleUrl, array_merge(['timeout' => 10.0], $options));
-            $request = $client->get($guzzleUrl);
+            $clientOptions = isset($options['client']) ? (array)$options['client'] : [];
+            $client = new Client($guzzleUrl, array_merge(['timeout' => 10.0], $clientOptions));
+            $requestOptions = isset($options['request']) ? (array)$options['request'] : [];
+            $request = $client->get($guzzleUrl, null, $requestOptions);
             $response = $client->send($request);
             return self::createFromString(strval($response->getBody()));
 
@@ -95,6 +97,7 @@ public static function createFromString($str)
      */
     protected static function createViaStreamWrapper($url, array $options = [])
     {
+        $clientOptions = isset($options['client']) ? (array)$options['client'] : [];
         $opts = array_merge_recursive([
             'http' => [
                 'method' => 'GET',
@@ -104,8 +107,10 @@ protected static function createViaStreamWrapper($url, array $options = [])
                 'timeout' => 10.0,
                 'header' => "Accept-language: en\r\n",
             ]
-        ], $options);
+        ], $clientOptions);
         $context = stream_context_create($opts);
+        $requestOptions = isset($options['request']) ? (array)$options['request'] : [];
+        stream_context_set_params($context, $requestOptions);
         $response = @file_get_contents($url, false, $context);
         return self::createFromString($response);
     }