improved error reporting

Author: oscarotero

src/Embed.php

@@ -45,11 +45,13 @@ public static function create($request, array $config = array())
             return $info;
         }
 
-        if (!$request->isValid()) {
-            throw new Exceptions\InvalidUrlException("The url '{$request->getUrl()}' returns the http code '{$request->getHttpCode()}'");
+        $error = $request->getError();
+
+        if (empty($error)) {
+            throw new Exceptions\InvalidUrlException(sprintf("The url '%s' returns the http code %s", $request->getUrl(), $request->getHttpCode()));
         }
 
-        throw new Exceptions\InvalidUrlException("The url '{$request->getUrl()}' is not supported");
+        throw new Exceptions\InvalidUrlException(sprintf("The url '%s' returns the following error: %s", $request->getUrl(), $error));
     }
 
     /**

src/Request.php

@@ -172,6 +172,16 @@ public function getMimeType()
         return $this->getResolver()->getMimeType();
     }
 
+    /**
+     * Get the connection error.
+     *
+     * @return string|null
+     */
+    public function getError()
+    {
+        return $this->getResolver()->getError();
+    }
+
     /**
      * Get the content of the url.
      *

src/RequestResolvers/Curl.php

@@ -18,6 +18,7 @@ class Curl implements RequestResolverInterface
         CURLOPT_MAXREDIRS => 20,
         CURLOPT_CONNECTTIMEOUT => 10,
         CURLOPT_TIMEOUT => 10,
+        CURLOPT_SSL_VERIFYHOST => false,
         CURLOPT_SSL_VERIFYPEER => false,
         CURLOPT_ENCODING => '',
         CURLOPT_AUTOREFERER => true,
@@ -38,14 +39,6 @@ public function __construct($url, array $config)
     {
         $this->url = $url;
 
-        var_dump(ini_get('open_basedir'));
-        var_dump(ini_get('safe_mode'));
-
-        //http://stackoverflow.com/questions/14054652/getting-301-with-curl-despite-followlocation
-        if (ini_get('open_basedir') !== '' && ini_get('safe_mode') === false) {
-            $this->config[CURLOPT_SSL_VERIFYHOST] = false;
-        }
-
         $this->config = $config + $this->config;
     }
 
@@ -73,6 +66,14 @@ public function getMimeType()
         return $this->getResult('mime_type');
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getError()
+    {
+        return $this->getResult('error');
+    }
+
     /**
      * {@inheritdoc}
      */

src/RequestResolvers/Guzzle5.php

@@ -21,6 +21,8 @@ class Guzzle5 implements RequestResolverInterface
      */
     protected $response;
 
+    protected $error;
+
     protected $defaultConfig = [
         'verify' => false,
         'timeout' => 10,
@@ -50,64 +52,73 @@ public function __construct($url, array $config)
     }
 
     /**
-     * Get the http code of the url, for example: 200.
-     *
-     * @return int The http code
+     * {@inheritdoc}
      */
     public function getHttpCode()
     {
-        return $this->getResponse()->getStatusCode();
+        $response = $this->getResponse();
+
+        return $response ? $response->getStatusCode() : null;
     }
 
     /**
-     * Get the content-type of the url, for example: text/html.
-     *
-     * @return string The content-type header or null
+     * {@inheritdoc}
      */
     public function getMimeType()
     {
-        return $this->getResponse()->getHeader('Content-Type');
+        $response = $this->getResponse();
+
+        return $response ? $response->getHeader('Content-Type') : null;
     }
 
     /**
-     * Get the content of the url.
-     *
-     * @return string The content or false
+     * {@inheritdoc}
+     */
+    public function getError()
+    {
+        return $error;
+    }
+
+    /**
+     * {@inheritdoc}
      */
     public function getContent()
     {
-        return $this->getResponse()->getBody()->getContents();
+        $response = $this->getResponse();
+
+        return $response ? $response->getBody()->getContents() : null;
     }
 
     /**
-     * Return the final url (after all possible redirects).
-     *
-     * @return string The final url
+     * {@inheritdoc}
      */
     public function getUrl()
     {
-        return $this->getResponse()->getEffectiveUrl();
+        $response = $this->getResponse();
+
+        return $response ? $response->getEffectiveUrl() : null;
     }
 
     /**
-     * Return the http request info (for debug purposes).
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getRequestInfo()
     {
         return $this->request->getConfig();
     }
 
     /**
-     * Get the result of the http request.
-     *
-     * @return Response
+     * {@inheritdoc}
      */
     protected function getResponse()
     {
         if ($this->response === null) {
-            $this->response = $this->client->send($this->request);
+            try {
+                $this->response = $this->client->send($this->request);
+            } catch (\Exception $exception) {
+                $error = $exception->getMessage();
+                $this->response = false;
+            }
         }
 
         return $this->response;

src/RequestResolvers/RequestResolverInterface.php

@@ -29,6 +29,13 @@ public function getHttpCode();
      */
     public function getMimeType();
 
+    /**
+     * Returns the connection error if exists
+     *
+     * @return string|null
+     */
+    public function getError();
+
     /**
      * Get the content of the url.
      *