Added support for PSR7 requests

Author: paquettg

CHANGELOG.md

@@ -10,9 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Added support for PSR7 HTTP clients and requests for URL calls.
+
 ### Changed
 - Fixed issue with \ causing an infite loop.
 
+### Removed
+- Removed curl interface and curl implementation.
+
 ## 2.2.0
 
 ### Added

composer.json

@@ -17,7 +17,10 @@
         "ext-mbstring": "*",
         "paquettg/string-encode": "~1.0.0",
         "ext-zlib": "*",
-        "ext-curl": "*"
+        "ext-curl": "*",
+        "php-http/httplug": "^2.1",
+        "php-http/guzzle6-adapter": "^2.0",
+        "guzzlehttp/psr7": "^1.6"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5.1",

src/PHPHtmlParser/Curl.php

@@ -1,6 +1,11 @@
 <?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
+use GuzzleHttp\Psr7\Request;
+use Http\Adapter\Guzzle6\Client;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use PHPHtmlParser\Dom\AbstractNode;
 use PHPHtmlParser\Dom\Collection;
 use PHPHtmlParser\Dom\HtmlNode;
@@ -13,6 +18,8 @@
 use PHPHtmlParser\Exceptions\StrictException;
 use PHPHtmlParser\Exceptions\UnknownChildTypeException;
 use PHPHtmlParser\Exceptions\LogicalException;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
 use stringEncode\Encode;
 
 /**
@@ -182,22 +189,27 @@ public function loadFromFile(string $file, array $options = []): Dom
     /**
      * Use a curl interface implementation to attempt to load
      * the content from a url.
-     * @param string                            $url
-     * @param array                             $options
-     * @param CurlInterface|null $curl
+     * @param string $url
+     * @param array $options
+     * @param ClientInterface $client
+     * @param RequestInterface|null $request
      * @return Dom
      * @throws ChildNotFoundException
      * @throws CircularException
-     * @throws CurlException
      * @throws StrictException
+     * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public function loadFromUrl(string $url, array $options = [], CurlInterface $curl = null): Dom
+    public function loadFromUrl(string $url, array $options = [], ClientInterface $client = null, RequestInterface $request = null): Dom
     {
-        if (is_null($curl)) {
-            // use the default curl interface
-            $curl = new Curl;
+        if (is_null($client)) {
+            $client = new Client();
         }
-        $content = $curl->get($url, $options);
+        if (is_null($request)) {
+            $request = new Request('GET', $url);
+        }
+
+        $response = $client->sendRequest($request);
+        $content = $response->getBody()->getContents();
 
         return $this->loadStr($content, $options);
     }

src/PHPHtmlParser/CurlInterface.php

@@ -1,11 +1,17 @@
 <?php declare(strict_types=1);
 namespace PHPHtmlParser;
 
+use GuzzleHttp\Psr7\Request;
+use Http\Adapter\Guzzle6\Client;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\Psr17FactoryDiscovery;
 use PHPHtmlParser\Exceptions\ChildNotFoundException;
 use PHPHtmlParser\Exceptions\CircularException;
 use PHPHtmlParser\Exceptions\CurlException;
 use PHPHtmlParser\Exceptions\NotLoadedException;
 use PHPHtmlParser\Exceptions\StrictException;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
 
 /**
  * Class StaticDom
@@ -82,6 +88,7 @@ public static function load(string $str): Dom
      * @throws ChildNotFoundException
      * @throws CircularException
      * @throws StrictException
+     * @throws Exceptions\LogicalException
      */
     public static function loadFromFile(string $file): Dom
     {
@@ -94,25 +101,29 @@ public static function loadFromFile(string $file): Dom
     /**
      * Creates a new dom object and calls loadFromUrl() on the
      * new object.
-     * @param string                            $url
-     * @param array                             $options
-     * @param CurlInterface|null $curl
+     * @param string $url
+     * @param array $options
+     * @param ClientInterface|null $client
+     * @param RequestInterface|null $request
      * @return Dom
      * @throws ChildNotFoundException
      * @throws CircularException
-     * @throws CurlException
      * @throws StrictException
+     * @throws \Psr\Http\Client\ClientExceptionInterface
      */
-    public static function loadFromUrl(string $url, array $options = [], CurlInterface $curl = null): Dom
+    public static function loadFromUrl(string $url, array $options = [], ClientInterface $client = null, RequestInterface $request = null): Dom
     {
         $dom       = new Dom;
         self::$dom = $dom;
-        if (is_null($curl)) {
-            // use the default curl interface
-            $curl = new Curl;
+
+        if (is_null($client)) {
+            $client = new Client();
+        }
+        if (is_null($request)) {
+            $request = new Request('GET', $url);
         }
 
-        return $dom->loadFromUrl($url, $options, $curl);
+        return $dom->loadFromUrl($url, $options, $client, $request);
     }
 
     /**

src/PHPHtmlParser/Dom.php

@@ -228,14 +228,22 @@ public function testLoadFileBigTwicePreserveOption()
 
     public function testLoadFromUrl()
     {
-        $curl = Mockery::mock('PHPHtmlParser\CurlInterface');
-        $curl->shouldReceive('get')
-             ->once()
-             ->with('http://google.com', [])
-             ->andReturn(file_get_contents('tests/data/files/small.html'));
-        
-        $dom = new Dom;
-        $dom->loadFromUrl('http://google.com', [], $curl);
+        $streamMock = Mockery::mock(\Psr\Http\Message\StreamInterface::class);
+        $streamMock->shouldReceive('getContents')
+            ->once()
+            ->andReturn(file_get_contents('tests/data/files/small.html'));
+        $responseMock = Mockery::mock(\Psr\Http\Message\ResponseInterface::class);
+        $responseMock->shouldReceive('getBody')
+            ->once()
+            ->andReturn($streamMock);
+        $clientMock = Mockery::mock(\Psr\Http\Client\ClientInterface::class);
+        $clientMock->shouldReceive('sendRequest')
+            ->once()
+            ->andReturn($responseMock);
+
+
+        $dom = new Dom;
+        $dom->loadFromUrl('http://google.com', [],  $clientMock);
         $this->assertEquals('VonBurgermeister', $dom->find('.post-row div .post-user font', 0)->text);
     }
 

src/PHPHtmlParser/StaticDom.php

@@ -58,13 +58,20 @@ public function testFindI()
 
     public function testLoadFromUrl()
     {
-        $curl = Mockery::mock('PHPHtmlParser\CurlInterface');
-        $curl->shouldReceive('get')
-             ->once()
-             ->with('http://google.com', [])
-             ->andReturn(file_get_contents('tests/data/files/small.html'));
+        $streamMock = Mockery::mock(\Psr\Http\Message\StreamInterface::class);
+        $streamMock->shouldReceive('getContents')
+            ->once()
+            ->andReturn(file_get_contents('tests/data/files/small.html'));
+        $responseMock = Mockery::mock(\Psr\Http\Message\ResponseInterface::class);
+        $responseMock->shouldReceive('getBody')
+            ->once()
+            ->andReturn($streamMock);
+        $clientMock = Mockery::mock(\Psr\Http\Client\ClientInterface::class);
+        $clientMock->shouldReceive('sendRequest')
+            ->once()
+            ->andReturn($responseMock);
 
-        Dom::loadFromUrl('http://google.com', [], $curl);
+        Dom::loadFromUrl('http://google.com', [], $clientMock);
         $this->assertEquals('VonBurgermeister', Dom::find('.post-row div .post-user font', 0)->text);
     }