Merge pull request #90 from zyuhel/master

oscarotero · oscarotero · commit bb3b265f6fb7 · 2015-11-05T17:48:06.000+01:00
Internal API change Provides ability to OEmbedImplementations getEndpoint method to provide different endpoints according to url. #88
diff --git a/src/Providers/OEmbed.php b/src/Providers/OEmbed.php
@@ -240,15 +240,15 @@ protected static function getEndPointFromRequest(Request $request, array $config
 
         if (class_exists($class) && $request->match($class::getPatterns())) {
             return [
-                'endPoint' => $class::getEndpoint(),
+                'endPoint' => $class::getEndpoint($request),
                 'params' => $class::getParams($request),
             ];
         }
 
         //Search using embedly
         if (!empty($config['embedlyKey']) && $request->match(OEmbed\Embedly::getPatterns())) {
             return [
-                'endPoint' => OEmbed\Embedly::getEndpoint(),
+                'endPoint' => OEmbed\Embedly::getEndpoint($request),
                 'params' => OEmbed\Embedly::getParams($request) + ['key' => $config['embedlyKey']],
             ];
         }
diff --git a/src/Providers/OEmbed/Bambuser.php b/src/Providers/OEmbed/Bambuser.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Bambuser extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'https://api.bambuser.com/oembed.json';
     }
diff --git a/src/Providers/OEmbed/Deviantart.php b/src/Providers/OEmbed/Deviantart.php
@@ -9,7 +9,7 @@ class Deviantart extends OEmbedImplementation
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://backend.deviantart.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Dotsub.php b/src/Providers/OEmbed/Dotsub.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Dotsub extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://dotsub.com/services/oembed';
     }
diff --git a/src/Providers/OEmbed/Embedly.php b/src/Providers/OEmbed/Embedly.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Embedly extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://api.embed.ly/1/oembed';
     }
diff --git a/src/Providers/OEmbed/Flickr.php b/src/Providers/OEmbed/Flickr.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Flickr extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://flickr.com/services/oembed';
     }
diff --git a/src/Providers/OEmbed/Imgur.php b/src/Providers/OEmbed/Imgur.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Imgur extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://api.imgur.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Instagram.php b/src/Providers/OEmbed/Instagram.php
@@ -9,7 +9,7 @@ class Instagram extends OEmbedImplementation
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://api.instagram.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Kickstarter.php b/src/Providers/OEmbed/Kickstarter.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Kickstarter extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.kickstarter.com/services/oembed';
     }
diff --git a/src/Providers/OEmbed/Meetup.php b/src/Providers/OEmbed/Meetup.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Meetup extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://api.meetup.com/oembed';
     }
diff --git a/src/Providers/OEmbed/OEmbedImplementation.php b/src/Providers/OEmbed/OEmbedImplementation.php
@@ -16,7 +16,7 @@ abstract class OEmbedImplementation
      *
      * @return string
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return '';
     }
diff --git a/src/Providers/OEmbed/Photobucket.php b/src/Providers/OEmbed/Photobucket.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Photobucket extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://s51.photobucket.com/oembed/';
     }
diff --git a/src/Providers/OEmbed/Polldaddy.php b/src/Providers/OEmbed/Polldaddy.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Polldaddy extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://polldaddy.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Rdio.php b/src/Providers/OEmbed/Rdio.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Rdio extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.rdio.com/api/oembed/';
     }
diff --git a/src/Providers/OEmbed/Scribd.php b/src/Providers/OEmbed/Scribd.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Scribd extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.scribd.com/services/oembed';
     }
diff --git a/src/Providers/OEmbed/Shoudio.php b/src/Providers/OEmbed/Shoudio.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Shoudio extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://shoudio.com/api/oembed';
     }
diff --git a/src/Providers/OEmbed/Smugmug.php b/src/Providers/OEmbed/Smugmug.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Smugmug extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://api.smugmug.com/services/oembed/';
     }
diff --git a/src/Providers/OEmbed/Soundcloud.php b/src/Providers/OEmbed/Soundcloud.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Soundcloud extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://soundcloud.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Spotify.php b/src/Providers/OEmbed/Spotify.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Spotify extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'https://embed.spotify.com/oembed';
     }
diff --git a/src/Providers/OEmbed/Ustream.php b/src/Providers/OEmbed/Ustream.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Ustream extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.ustream.tv/oembed';
     }
diff --git a/src/Providers/OEmbed/WordPress.php b/src/Providers/OEmbed/WordPress.php
@@ -2,6 +2,8 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 /**
  * Class WordPress
  * WordPress.tv embeds.
@@ -11,7 +13,7 @@ class WordPress extends OEmbedImplementation
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'https://wordpress.tv/oembed';
     }
diff --git a/src/Providers/OEmbed/Yfrog.php b/src/Providers/OEmbed/Yfrog.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Yfrog extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.yfrog.com/api/oembed';
     }
diff --git a/src/Providers/OEmbed/Youtube.php b/src/Providers/OEmbed/Youtube.php
@@ -2,12 +2,14 @@
 
 namespace Embed\Providers\OEmbed;
 
+use Embed\Url;
+
 class Youtube extends OEmbedImplementation
 {
     /**
      * {@inheritdoc}
      */
-    public static function getEndPoint()
+    public static function getEndPoint(Url $url)
     {
         return 'http://www.youtube.com/oembed';
     }

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,14 @@`
`2`	`2`
`3`	`3`	`namespace Embed\Providers\OEmbed;`
`4`	`4`
	`5`	`+use Embed\Url;`
	`6`	`+`
`5`	`7`	`class Bambuser extends OEmbedImplementation`
`6`	`8`	`{`
`7`	`9`	`/**`
`8`	`10`	`* {@inheritdoc}`
`9`	`11`	`*/`
`10`		`- public static function getEndPoint()`
	`12`	`+ public static function getEndPoint(Url $url)`
`11`	`13`	`{`
`12`	`14`	`return 'https://api.bambuser.com/oembed.json';`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class Deviantart extends OEmbedImplementation`
`9`	`9`	`/**`
`10`	`10`	`* {@inheritdoc}`
`11`	`11`	`*/`
`12`		`- public static function getEndPoint()`
	`12`	`+ public static function getEndPoint(Url $url)`
`13`	`13`	`{`
`14`	`14`	`return 'http://backend.deviantart.com/oembed';`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class Instagram extends OEmbedImplementation`
`9`	`9`	`/**`
`10`	`10`	`* {@inheritdoc}`
`11`	`11`	`*/`
`12`		`- public static function getEndPoint()`
	`12`	`+ public static function getEndPoint(Url $url)`
`13`	`13`	`{`
`14`	`14`	`return 'http://api.instagram.com/oembed';`
`15`	`15`	`}`