bugfixes

Author: oscarotero

src/Adapters/Adapter.php

@@ -4,36 +4,13 @@
 
 use Embed\Http\Uri;
 use Embed\Http\Response;
+use Embed\Http\ImageResponse;
 use Embed\Http\DispatcherInterface;
 use Embed\Bag;
 use Embed\Embed;
 
 /**
  * Base class extended by all adapters.
- *
- * @property null|string  $title
- * @property null|string  $description
- * @property null|string  $url
- * @property null|string  $type
- * @property array        $tags
- * @property array        $feeds
- * @property array        $images
- * @property array        $imagesUrls
- * @property null|string  $image
- * @property null|int     $imageWidth
- * @property null|int     $imageHeight
- * @property null|string  $code
- * @property null|int     $width
- * @property null|int     $height
- * @property null|float   $aspectRatio
- * @property null|string  $authorName
- * @property null|string  $authorUrl
- * @property array        $providerIcons
- * @property array        $providerIconsUrls
- * @property null|string  $providerIcon
- * @property null|string  $providerName
- * @property null|string  $providerUrl
- * @property null|string  $publishedTime
  */
 abstract class Adapter
 {
@@ -575,7 +552,7 @@ private function dispatchImagesInfo($urls)
         }
 
         return array_map(
-            function ($response) {
+            function (ImageResponse $response) {
                 return [
                     'url' => (string) $response->getUri(),
                     'width' => $response->getWidth(),

src/Adapters/AdapterInterface.php

@@ -9,6 +9,30 @@
 
 /**
  * Interface used by all adapters.
+ *
+ * @property null|string  $title
+ * @property null|string  $description
+ * @property null|string  $url
+ * @property null|string  $type
+ * @property array        $tags
+ * @property array        $feeds
+ * @property array        $images
+ * @property array        $imagesUrls
+ * @property null|string  $image
+ * @property null|int     $imageWidth
+ * @property null|int     $imageHeight
+ * @property null|string  $code
+ * @property null|int     $width
+ * @property null|int     $height
+ * @property null|float   $aspectRatio
+ * @property null|string  $authorName
+ * @property null|string  $authorUrl
+ * @property array        $providerIcons
+ * @property array        $providerIconsUrls
+ * @property null|string  $providerIcon
+ * @property null|string  $providerName
+ * @property null|string  $providerUrl
+ * @property null|string  $publishedTime
  */
 interface AdapterInterface extends DataInterface
 {

src/Http/CurlDispatcher.php

@@ -4,6 +4,7 @@
 
 use Embed\Embed;
 use Embed\Exceptions\EmbedException;
+use stdClass;
 
 /**
  * Curl dispatcher.
@@ -146,7 +147,7 @@ public function dispatchImages(array $uris)
 
             $curl = new CurlResult($connection);
 
-            $curl->onBody(function ($body, $data) use ($finfo, $mimetypes) {
+            $curl->onBody(function ($body, stdClass $data) use ($finfo, $mimetypes) {
                 if (empty($data->mime)) {
                     $data->mime = finfo_buffer($finfo, $body);
 

src/Providers/OEmbed/Embedly.php

@@ -4,7 +4,7 @@
 
 use Embed\Adapters\AdapterInterface;
 use Embed\Http\Response;
-use Embed\Url;
+use Embed\Http\Uri;
 
 class Embedly implements EndPointInterface
 {

src/Providers/OEmbed/Iframely.php

@@ -4,7 +4,7 @@
 
 use Embed\Adapters\AdapterInterface;
 use Embed\Http\Response;
-use Embed\Url;
+use Embed\Http\Uri;
 
 class Iframely implements EndPointInterface
 {

tests/AbstractTestCase.php

@@ -6,6 +6,7 @@
 use Embed\Embed;
 use Embed\Http\Response;
 use Embed\Adapters\AdapterInterface;
+use InvalidArgumentException;
 
 /**
  * Base class with custom utilities for testing.
@@ -81,30 +82,5 @@ protected function assertEmbed($url, array $info, array $config = array())
                     throw new InvalidArgumentException("No valid {$name} assertion");
             }
         }
-
-        //$this->assertOembedAutodiscover($i->getResponse());
-    }
-
-    /**
-     * This method allow to discover sites including the oembed endpoint in the code,
-     * to remove the custom Oembed provider if exists.
-     */
-    private function assertOembedAutodiscover(Response $response)
-    {
-        $className = $response->getUri()->getClassNameForDomain();
-
-        //exceptions
-        if (in_array($className, ['Wordpress', 'Youtube', 'Jsbin'])) {
-            return;
-        }
-
-        $class = 'Embed\\Providers\\OEmbed\\'.$className;
-
-        if (class_exists($class)) {
-            $body = $response->getContent();
-
-            $this->assertFalse(strpos($body, '/json+oembed'), 'Autodiscovered json OEmbed');
-            $this->assertFalse(strpos($body, '/xml+oembed'), 'Autodiscovered xml OEmbed');
-        }
     }
 }

tests/ImageInfoTest.php

@@ -29,10 +29,6 @@ public function testBase64Images()
     {
         $dispatcher = new CurlDispatcher();
 
-        $result = $dispatcher->dispatchImages([
-            Uri::create('http://www.mixdecultura.ro/wp-content/uploads/2013/03/galicia-locuinte-celtice.jpg'),
-        ]);
-
         $info = Embed::create('http://www.websiteoptimization.com/speed/tweak/inline-images/folder-test.html');
 
         $this->assertEquals(