fixed tests

Author: oscarotero

src/Embed.php

@@ -75,7 +75,11 @@ private static function process(Url $url, array $config, DispatcherInterface $di
             return new Adapters\Webpage($response, $config, $dispatcher);
         }
 
-        $exception = new Exceptions\InvalidUrlException(sprintf("Invalid url '%s' (Status code %s)", (string) $url, $response->getStatusCode()));
+        if ($response->getError() === null) {
+            $exception = new Exceptions\InvalidUrlException(sprintf("Invalid url '%s' (Status code %s)", (string) $url, $response->getStatusCode()));
+        } else {
+            $exception = new Exceptions\InvalidUrlException($response->getError());
+        }
 
         $exception->setResponse($response);
 

src/Http/AbstractResponse.php

@@ -84,6 +84,16 @@ public function getInfo()
         return $this->info;
     }
 
+    /**
+     * Returns dispatch error.
+     *
+     * @return string|null
+     */
+    public function getError()
+    {
+        return empty($this->info['error']) ? null : $this->info['error'];
+    }
+
     /**
      * Get a header.
      *

src/Http/CurlDispatcher.php

@@ -16,7 +16,7 @@ class CurlDispatcher implements DispatcherInterface
         CURLOPT_MAXREDIRS => 10,
         CURLOPT_CONNECTTIMEOUT => 10,
         CURLOPT_TIMEOUT => 10,
-        CURLOPT_SSL_VERIFYHOST => false,
+        CURLOPT_SSL_VERIFYHOST => 0,
         CURLOPT_SSL_VERIFYPEER => false,
         CURLOPT_ENCODING => '',
         CURLOPT_AUTOREFERER => true,
@@ -89,6 +89,16 @@ public function dispatch(Url $url)
             return $this->exec($url, $options);
         }
 
+        //Other sites needs a certificate
+        if ($response->getStatusCode() === 0 && strpos($response->getError(), 'SSL') !== false) {
+            $options[CURLOPT_SSL_VERIFYHOST] = 2;
+            $options[CURLOPT_SSL_VERIFYPEER] = true;
+            //https://curl.haxx.se/docs/caextract.html
+            $options[CURLOPT_CAINFO] = __DIR__.'/../resources/cacert.pem';
+
+            return $this->exec($url, $options);
+        }
+
         return $response;
     }
 

src/Http/CurlResult.php

@@ -35,6 +35,10 @@ public function getResult()
     {
         $result = curl_getinfo($this->resource);
 
+        if (curl_errno($this->resource)) {
+            $result['error'] = curl_error($this->resource);
+        }
+
         return [
             'url' => isset($result['url']) ? $result['url'] : null,
             'statusCode' => isset($result['http_code']) ? $result['http_code'] : null,

src/resources/cacert.pem

@@ -22,9 +22,9 @@ public function testPlainText()
     public function testPlainUrlMatch()
     {
         $this->assertEmbed(
-            'http://alistapart.com/article/the-rich-typefaces-get-richer',
+            'https://alistapart.com/article/the-rich-typefaces-get-richer',
             [
-                'image' => 'http://alistapart.com/d/_made/pix/authors/photos/shoaf-headshot_120_120_c1.jpg',
+                'image' => 'https://alistapart.com/d/_made/pix/authors/photos/shoaf-headshot_120_120_c1.jpg',
             ],
             [
                 'images_blacklist' => [

tests/ImagesBlacklistTest.php

@@ -13,7 +13,7 @@ public function testOne()
                 'type' => 'rich',
                 'providerName' => 'jsbin',
                 'providerUrl' => 'http://jsbin.com',
-                'code' => '<iframe src="http://output.jsbin.com/vonesu/10/embed" width="640" height="480" frameborder="0"></iframe>',
+                'code' => '<iframe src="http://output.jsbin.com/vonesu/10/embed" width="320" height="240" frameborder="0"></iframe>',
             ]
         );
     }

tests/JsbinTest.php

@@ -7,7 +7,7 @@ class WikipediaTest extends AbstractTestCase
     public function testOne()
     {
         $description = <<<'EOT'
-Albert Einstein (/ˈaɪnstaɪn/; German: [ˈalbɛɐ̯t ˈaɪnʃtaɪn]; 14 March 1879 – 18 April 1955) was a German-born theoretical physicist. He developed the general theory of relativity, one of the two pillars of modern physics (alongside quantum mechanics). Einstein's work is also known for its influence on the philosophy of science. Einstein is best known in popular culture for his mass–energy equivalence formula E = mc2 (which has been dubbed "the world's most famous equation"). He received the 1921 Nobel Prize in Physics "for his services to Theoretical Physics, and especially for his discovery of the law of the photoelectric effect", a pivotal step in the evolution of quantum theory. Near the beginning of his career, Einstein thought that Newtonian mechanics was no longer enough to reconcile the laws of classical mechanics with the laws of the electromagnetic field. This led him to develop his special theory of relativity. He realized, however, that the principle of relativity could also be extended to gravitational fields, and...
+Albert Einstein (/ˈaɪnstaɪn/; German: [ˈalbɛɐ̯t ˈaɪnʃtaɪn]; 14 March 1879 – 18 April 1955) was a German-born theoretical physicist. He developed the theory of relativity, one of the two pillars of modern physics (alongside quantum mechanics). Einstein's work is also known for its influence on the philosophy of science. Einstein is best known in popular culture for his mass–energy equivalence formula E = mc2 (which has been dubbed "the world's most famous equation"). He received the 1921 Nobel Prize in Physics "for his services to theoretical physics, and especially for his discovery of the law of the photoelectric effect", a pivotal step in the evolution of quantum theory. Near the beginning of his career, Einstein thought that Newtonian mechanics was no longer enough to reconcile the laws of classical mechanics with the laws of the electromagnetic field. This led him to develop his special theory of relativity. He realized, however, that the principle of relativity could also be extended to gravitational fields, and with...
 EOT;
 
         $this->assertEmbed(