more bugs

oscarotero · oscarotero · commit 53179e85b992 · 2016-12-18T13:28:25.000+01:00
diff --git a/src/Adapters/Adapter.php b/src/Adapters/Adapter.php
@@ -7,7 +7,6 @@
 use Embed\Http\ImageResponse;
 use Embed\Http\DispatcherInterface;
 use Embed\Bag;
-use Embed\Embed;
 
 /**
  * Base class extended by all adapters.
diff --git a/src/Adapters/AdapterInterface.php b/src/Adapters/AdapterInterface.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Adapters;
 
-use Embed\Http\Uri;
 use Embed\Http\DispatcherInterface;
 use Embed\Http\Response;
 use Embed\DataInterface;
diff --git a/src/Adapters/Archive.php b/src/Adapters/Archive.php
@@ -2,8 +2,6 @@
 
 namespace Embed\Adapters;
 
-use Embed\Http\DispatcherInterface;
-use Embed\Http\Uri;
 use Embed\Http\Response;
 use Embed\Utils;
 use Embed\Providers\Api;
diff --git a/src/Embed.php b/src/Embed.php
@@ -4,7 +4,6 @@
 
 use Embed\Adapters\AdapterInterface;
 use Embed\Http\Uri;
-use Embed\Http\Request;
 use Embed\Http\DispatcherInterface;
 use Embed\Http\CurlDispatcher;
 
diff --git a/src/Http/CurlDispatcher.php b/src/Http/CurlDispatcher.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Http;
 
-use Embed\Embed;
 use Embed\Exceptions\EmbedException;
 use stdClass;
 
@@ -88,7 +87,7 @@ public function dispatch(Uri $uri)
             }
         });
 
-        $curl->onBody(function ($string, $data) {
+        $curl->onBody(function ($string, stdClass $data) {
             return !$data->isBinary;
         });
 
diff --git a/src/Http/Redirects.php b/src/Http/Redirects.php
@@ -2,8 +2,6 @@
 
 namespace Embed\Http;
 
-use Embed\Embed;
-
 /**
  * Class to resolve some specific redirections.
  */
@@ -41,7 +39,7 @@ public static function resolve(Uri $uri)
      *
      * @return Uri
      */
-    private static function google(Uri $uri)
+    public static function google(Uri $uri)
     {
         if (($value = $uri->getQueryParameter('url'))) {
             return Uri::create($value);
@@ -57,7 +55,7 @@ private static function google(Uri $uri)
      *
      * @return Uri
      */
-    private static function googleTranslator(Uri $uri)
+    public static function googleTranslator(Uri $uri)
     {
         if (($value = $uri->getQueryParameter('u'))) {
             return Uri::create($value);
@@ -73,7 +71,7 @@ private static function googleTranslator(Uri $uri)
      *
      * @return Uri
      */
-    private static function hashBang(Uri $uri)
+    public static function hashBang(Uri $uri)
     {
         if (($path = preg_replace('|^(/?!)|', '', $uri->getFragment()))) {
             return $uri->withPath($uri->getPath().$path);
@@ -89,7 +87,7 @@ private static function hashBang(Uri $uri)
      *
      * @return Uri
      */
-    private static function spotify(Uri $uri)
+    public static function spotify(Uri $uri)
     {
         return $uri->withHost('open.spotify.com');
     }
diff --git a/src/Providers/Api/Archive.php b/src/Providers/Api/Archive.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
 use Embed\Providers\ProviderInterface;
diff --git a/src/Providers/Api/Gist.php b/src/Providers/Api/Gist.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
 use Embed\Providers\ProviderInterface;
diff --git a/src/Providers/Api/GoogleMaps.php b/src/Providers/Api/GoogleMaps.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
 use Embed\Providers\ProviderInterface;
diff --git a/src/Providers/Api/Imageshack.php b/src/Providers/Api/Imageshack.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Http\Uri;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
diff --git a/src/Providers/Api/Soundcloud.php b/src/Providers/Api/Soundcloud.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Http\Uri;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
diff --git a/src/Providers/Api/Wikipedia.php b/src/Providers/Api/Wikipedia.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers\Api;
 
-use Embed\Embed;
 use Embed\Adapters\AdapterInterface;
 use Embed\Providers\Provider;
 use Embed\Providers\ProviderInterface;
diff --git a/src/Providers/OEmbed.php b/src/Providers/OEmbed.php
@@ -2,7 +2,6 @@
 
 namespace Embed\Providers;
 
-use Embed\Embed;
 use Embed\Adapters\AdapterInterface;
 use Embed\Http\Response;
 use Embed\Http\Uri;
diff --git a/src/Providers/Provider.php b/src/Providers/Provider.php
@@ -4,7 +4,6 @@
 
 use Embed\Adapters\AdapterInterface;
 use Embed\Bag;
-use Embed\Embed;
 
 /**
  * Abstract class used by all providers.
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -4,7 +4,6 @@
 
 use PHPUnit_Framework_TestCase;
 use Embed\Embed;
-use Embed\Http\Response;
 use Embed\Adapters\AdapterInterface;
 use InvalidArgumentException;
 
diff --git a/tests/ImageInfoTest.php b/tests/ImageInfoTest.php
@@ -27,8 +27,6 @@ public function testCurl()
 
     public function testBase64Images()
     {
-        $dispatcher = new CurlDispatcher();
-
         $info = Embed::create('http://www.websiteoptimization.com/speed/tweak/inline-images/folder-test.html');
 
         $this->assertEquals(

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace Embed\Http;`
`4`	`4`
`5`		`-use Embed\Embed;`
`6`		`-`
`7`	`5`	`/**`
`8`	`6`	`* Class to resolve some specific redirections.`
`9`	`7`	`*/`
`@@ -41,7 +39,7 @@ public static function resolve(Uri $uri)`
`41`	`39`	`*`
`42`	`40`	`* @return Uri`
`43`	`41`	`*/`
`44`		`- private static function google(Uri $uri)`
	`42`	`+ public static function google(Uri $uri)`
`45`	`43`	`{`
`46`	`44`	`if (($value = $uri->getQueryParameter('url'))) {`
`47`	`45`	`return Uri::create($value);`
`@@ -57,7 +55,7 @@ private static function google(Uri $uri)`
`57`	`55`	`*`
`58`	`56`	`* @return Uri`
`59`	`57`	`*/`
`60`		`- private static function googleTranslator(Uri $uri)`
	`58`	`+ public static function googleTranslator(Uri $uri)`
`61`	`59`	`{`
`62`	`60`	`if (($value = $uri->getQueryParameter('u'))) {`
`63`	`61`	`return Uri::create($value);`
`@@ -73,7 +71,7 @@ private static function googleTranslator(Uri $uri)`
`73`	`71`	`*`
`74`	`72`	`* @return Uri`
`75`	`73`	`*/`
`76`		`- private static function hashBang(Uri $uri)`
	`74`	`+ public static function hashBang(Uri $uri)`
`77`	`75`	`{`
`78`	`76`	`if (($path = preg_replace('\|^(/?!)\|', '', $uri->getFragment()))) {`
`79`	`77`	`return $uri->withPath($uri->getPath().$path);`
`@@ -89,7 +87,7 @@ private static function hashBang(Uri $uri)`
`89`	`87`	`*`
`90`	`88`	`* @return Uri`
`91`	`89`	`*/`
`92`		`- private static function spotify(Uri $uri)`
	`90`	`+ public static function spotify(Uri $uri)`
`93`	`91`	`{`
`94`	`92`	`return $uri->withHost('open.spotify.com');`
`95`	`93`	`}`