Use Guzzle for HTTP requests

composer.json

@@ -7,6 +7,9 @@
         "bcosca/fatfree-core": "^3.6",
         "fossar/tcpdf-parser": "^6.2",
         "fossar/twitteroauth-php54": "^0.7.3-beta",
+        "fossar/guzzle-transcoder": "^0.0.3",
+        "guzzlehttp/guzzle": "^5.3",
+        "guzzlehttp/log-subscriber": "^1.0",
         "htmlawed/htmlawed": "^1.1",
         "j0k3r/graby": "^1.6",
         "linkorb/jsmin-php": "^1.0",

gruntfile.js

@@ -6,6 +6,7 @@ function isNotUnimportant(dest) {
     const filenameDisallowed = [
         /^changelog/i,
         /^contributing/i,
+        /^upgrading/i,
         /^copying/i,
         /^readme/i,
         /^licen[cs]e/i,

helpers/Image.php

@@ -3,6 +3,7 @@
 namespace helpers;
 
 use Elphin\IcoFileLoader\IcoFileService;
+use GuzzleHttp;
 use WideImage\WideImage;
 
 /**
@@ -58,7 +59,7 @@ public function fetchFavicon($url, $isHtmlUrl = false, $width = false, $height =
 
         $shortcutIcon = $this->parseShortcutIcon($html);
         if ($shortcutIcon !== null) {
-            $shortcutIcon = (string) \SimplePie_IRI::absolutize($url, $shortcutIcon);
+            $shortcutIcon = (string) GuzzleHttp\Url::fromString($url)->combine($shortcutIcon);
 
             $faviconAsPng = $this->loadImage($shortcutIcon, $width, $height);
             if ($faviconAsPng !== false) {

helpers/WebClient.php

@@ -2,6 +2,11 @@
 
 namespace helpers;
 
+use Exception;
+use GuzzleHttp;
+use GuzzleHttp\Subscriber\Log\LogSubscriber;
+use Fossar\GuzzleTranscoder\GuzzleTranscoder;
+
 /**
  * Helper class for web request
  *
@@ -10,6 +15,36 @@
  * @author     Alexandre Rossi <alexandre.rossi@gmail.com>
  */
 class WebClient {
+    /** @var GuzzleHttp\Client */
+    private static $httpClient;
+
+    /**
+     * Provide a HTTP client for use by spouts
+     *
+     * @return GuzzleHttp\Client
+     */
+    public static function getHttpClient() {
+        if (!isset(self::$httpClient)) {
+            $version = \F3::get('version');
+            $httpClient = new GuzzleHttp\Client([
+                'defaults' => [
+                    'headers' => [
+                        'User-Agent' => self::getUserAgent(),
+                    ]
+                ]
+            ]);
+            $httpClient->getEmitter()->attach(new GuzzleTranscoder());
+
+            if ($f3->get('logger_level') === 'DEBUG') {
+                $httpClient->getEmitter()->attach(new LogSubscriber(\F3::get('logger')));
+            }
+
+            self::$httpClient = $httpClient;
+        }
+
+        return self::$httpClient;
+    }
+
     /**
      * get the user agent to use for web based spouts
      *
@@ -32,31 +67,20 @@ public static function getUserAgent($agentInfo = null) {
      *
      * @param string $subagent Extra user agent info to use in the request
      *
+     * @throws GuzzleHttp\Exception\RequestException When an error is encountered
+     * @throws Exception Unless 200 0K response is received
+     *
      * @return string request data
      */
     public static function request($url, $agentInfo = null) {
-        $options = [
-            'user_agent' => self::getUserAgent($agentInfo),
-            'ignore_errors' => true,
-            'timeout' => 60
-        ];
-        $request = \Web::instance()->request($url, $options);
-
-        // parse last (in case of redirects) HTTP status
-        $http_status = null;
-        foreach ($request['headers'] as $header) {
-            if (substr($header, 0, 5) == 'HTTP/') {
-                $tokens = explode(' ', $header);
-                if (isset($tokens[1])) {
-                    $http_status = $tokens[1];
-                }
-            }
-        }
+        $http = self::getHttpClient();
+        $response = $http->get($url);
+        $data = (string) $response->getBody();
 
-        if ($http_status != '200') {
-            throw new \Exception(substr($request['body'], 0, 512));
+        if ($response->getStatusCode() !== 200) {
+            throw new Exception(substr($data, 0, 512));
         }
 
-        return $request['body'];
+        return $data;
     }
 }