Merge branch 'master' into master

Author: xyNNN

src/Adapters/Adapter.php

@@ -10,6 +10,7 @@
 use Embed\Http\Url;
 use Embed\Providers\Provider;
 use Embed\Utils;
+use Exception;
 
 /**
  * Base class extended by all adapters.
@@ -317,7 +318,11 @@ public function getUrl()
         return $this->getFirstFromProviders(function (Provider $provider) use ($blacklist, $homeUrl) {
             $url = $provider->getUrl();
 
-            if ($homeUrl === $url || (!empty($blacklist) && Url::create($url)->match($blacklist))) {
+            try {
+                if ($homeUrl === $url || (!empty($blacklist) && Url::create($url)->match($blacklist))) {
+                    return false;
+                }
+            } catch (Exception $error) {
                 return false;
             }
 

src/Adapters/File.php

@@ -28,6 +28,7 @@ class File extends Adapter
         'image/png' => ['photo', 'imageHtml'],
         'image/bmp' => ['photo', 'imageHtml'],
         'image/ico' => ['photo', 'imageHtml'],
+        'image/webp' => ['photo', 'imageHtml'],
         'text/rtf' => ['rich', 'google'],
         'application/pdf' => ['rich', 'google'],
         'application/msword' => ['rich', 'google'],

src/Http/Url.php

@@ -621,7 +621,8 @@ private static function getSuffixes()
     {
         if (self::$public_suffix_list === null) {
             self::$public_suffix_list = (@include __DIR__.'/../resources/public_suffix_list.php') ? [];
-    	}
+        }
+      
         return self::$public_suffix_list;
     }
 

src/Providers/OEmbed/Poll.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Embed\Providers\OEmbed;
+
+class Poll extends Polldaddy
+{
+    protected static $pattern = 'poll.fm/*';
+}

src/Providers/OEmbed/Polldaddy.php

@@ -5,5 +5,5 @@
 class Polldaddy extends EndPoint implements EndPointInterface
 {
     protected static $pattern = 'polldaddy.com/poll/*';
-    protected static $endPoint = 'http://polldaddy.com/oembed';
+    protected static $endPoint = 'https://api.crowdsignal.com/oembed';
 }

tests/CadenaserTest.php

@@ -13,7 +13,7 @@ public function testOne()
                 'width' => 620,
                 'height' => 100,
                 'type' => 'rich',
-                'code' => '<iframe src="http://play.cadenaser.com/widget/audio/001RD010000004275766/" frameborder="0" allowTransparency="true" style="border:none;overflow:hidden;width:620px;height:100px;"></iframe>',
+                'code' => '<iframe src="https://play.cadenaser.com/widget/audio/001RD010000004275766/" frameborder="0" allowTransparency="true" style="border:none;overflow:hidden;width:620px;height:100px;"></iframe>',
                 'providerName' => 'Cadena SER',
             ]
         );

tests/PolldaddyTest.php

@@ -11,9 +11,9 @@ public function testOne()
             [
                 'title' => 'Which design do you prefer?',
                 'description' => 'Poll Answers: Option #1, Option #2,',
-                'code' => '<script type="text/javascript" charset="utf-8" src="https://secure.polldaddy.com/p/7012505.js"></script><noscript><a href="https://polldaddy.com/poll/7012505/">Which design do you prefer?</a></noscript>',
+                'code' => '<script type="text/javascript" charset="utf-8" src="https://secure.polldaddy.com/p/7012505.js"></script><noscript><a href="https://poll.fm/7012505">Which design do you prefer?</a></noscript>',
                 'type' => 'rich',
-                'providerName' => 'Polldaddy',
+                'providerName' => 'Crowdsignal',
             ]
         );
     }

tests/SoundcloudTest.php

@@ -11,7 +11,7 @@ public function testOne()
             [
                 'title' => "Lost You (feat. Twin Shadow & D'Angelo Lacy) by Zeds Dead",
                 'type' => 'rich',
-                'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F150745932&show_artwork=true"></iframe>',
+                'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F150745932&show_artwork=true"></iframe>',
                 'providerName' => 'SoundCloud',
                 'providerUrl' => 'http://soundcloud.com',
             ]
@@ -26,7 +26,7 @@ public function testTwo()
                 'title' => 'Bruce Neil',
                 'description' => 'Bruce Neil from Wokingham is a singer/songwriter with a folk inspired sound, producing songs with heartfelt depth and lyrics that captivate the listener, taking them on an insightful and thought-provoking journey. As a winner of BBC Introducing, resulting in air play nationally, he has recently achieved widespread public attention following the video release of his percussive folk rendition of Guns N’ Roses track Paradise City. Not only did this go viral on social media, it was endorsed by the band themselves and has achieved recognition and air play from several US radio stations. He takes his musical inspiration and guitar-playing style from the likes of Passenger and Mick Flannery.',
                 'type' => 'rich',
-                'code' => '<iframe width="100%" height="450" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=http%3A%2F%2Fapi.soundcloud.com%2Fusers%2F6538603&show_artwork=true"></iframe>',
+                'code' => '<iframe width="100%" height="450" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=https%3A%2F%2Fapi.soundcloud.com%2Fusers%2F6538603&show_artwork=true"></iframe>',
                 'providerName' => 'SoundCloud',
                 'providerUrl' => 'http://soundcloud.com',
             ]
@@ -41,7 +41,7 @@ public function testThree()
                 'title' => 'LOWE CT Cape Times - World Cup by iDidTht.com',
                 'description' => 'If you did it. Show it on ididtht.com',
                 'type' => 'rich',
-                'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=http%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F191904624&show_artwork=true"></iframe>',
+                'code' => '<iframe width="100%" height="400" scrolling="no" frameborder="no" src="https://w.soundcloud.com/player/?visual=true&url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F191904624&show_artwork=true"></iframe>',
                 'providerName' => 'SoundCloud',
                 'providerUrl' => 'http://soundcloud.com',
             ]