minor fixes

Author: oscarotero

src/Adapters/Adapter.php

@@ -319,19 +319,17 @@ public function getImages()
     public function getImage()
     {
         if ($this->config['getBiggerImage']) {
-            if (($src = Utils::getBiggerValue($this->images, true)) !== null) {
-                $image = $this->images[$src];
+            $images = $this->images;
 
-                if (($image['width'] >= $this->config['minImageWidth']) && ($image['height'] >= $this->config['minImageHeight'])) {
-                    return $src;
-                }
+            if ($images) {
+                $images = [$images];
             }
-
-            return;
+        } else {
+            $images = Utils::sortByProviders($this->images);
         }
 
-        foreach (Utils::sortByProviders($this->images) as $images) {
-            if (($key = Utils::getBiggerValue($images, true)) !== null) {
+        foreach ($images as $image) {
+            if (($key = Utils::getBiggerValue($image, true)) !== null) {
                 $image = $this->images[$key];
 
                 if (($image['width'] >= $this->config['minImageWidth']) && ($image['height'] >= $this->config['minImageHeight'])) {
@@ -382,11 +380,8 @@ public function getHeight()
      */
     public function getAspectRatio()
     {
-        $width = $this->width;
-        $height = $this->height;
-
-        if ($width && (strpos($width, '%') === false) && $height && (strpos($height, '%') === false)) {
-            return round(($height / $width) * 100, 3);
+        if (!empty($this->width) && (strpos($this->width, '%') === false) && !empty($this->height) && (strpos($this->height, '%') === false)) {
+            return round(($this->height / $this->width) * 100, 3);
         }
     }
 

src/Adapters/Archive.php

@@ -10,6 +10,8 @@
 
 class Archive extends Webpage implements AdapterInterface
 {
+    public $api;
+
     /**
      * {@inheritdoc}
      */

src/Adapters/Facebook.php

@@ -165,7 +165,7 @@ public function getSource()
     {
         $id = $this->api->get('id');
 
-        if ($id) {
+        if (!empty($id)) {
             return 'https://www.facebook.com/feeds/page.php?id='.$id.'&format=rss20';
         }
     }

src/ImageInfo/Curl.php

@@ -36,18 +36,14 @@ class Curl implements ImageInfoInterface
      */
     public static function getImagesInfo(array $images, array $config = null)
     {
-        if (!$images) {
+        if (empty($images)) {
             return [];
         }
 
         if (count($images) === 1) {
             $info = self::getImageInfo($images[0], $config);
 
-            if ($info) {
-                return [array_merge($images[0], $info)];
-            }
-
-            return [];
+            return empty($info) ? [] : [array_merge($images[0], $info)];
         }
 
         $finfo = finfo_open(FILEINFO_MIME_TYPE);

src/Providers/Html.php

@@ -247,7 +247,7 @@ protected static function extractImages(\DOMElement $html, Bag $bag, $domain = n
                 }
 
                 //Avoid external images or in external links
-                if ($domain) {
+                if ($domain !== null) {
                     if ($src->getDomain() !== $domain) {
                         continue;
                     }
@@ -263,6 +263,9 @@ protected static function extractImages(\DOMElement $html, Bag $bag, $domain = n
                                     continue 2;
                                 }
                             }
+                            if ($parent->hasAttribute('rel') && (string) $parent->getAttribute('rel') === 'nofollow') {
+                                continue 2;
+                            }
 
                             break;
                         }

src/Request.php

@@ -27,11 +27,11 @@ class Request
      */
     public function __construct(Url $url, $resolverClass = null, array $resolverConfig = null)
     {
-        if ($resolverClass) {
+        if ($resolverClass !== null) {
             $this->setResolverClass($resolverClass);
         }
 
-        if ($resolverConfig) {
+        if ($resolverConfig !== null) {
             $this->setResolverConfig($resolverConfig);
         }
 

src/Url.php

@@ -119,14 +119,14 @@ public function setHost($host)
      *
      * @param boolean $first_level True to return the first level domain (.com, .es, etc)
      *
-     * @return string The domain or null
+     * @return string
      */
     public function getDomain($first_level = false)
     {
         $host = $this->getHost();
 
-        if (!$host) {
-            return;
+        if (empty($host)) {
+            return '';
         }
 
         $host = array_reverse(explode('.', $host));

src/Utils.php

@@ -215,7 +215,7 @@ public static function getBiggerValue(array $values, $returnKey = false)
             }
         }
 
-        if (isset($bigger)) {
+        if ($bigger !== null) {
             return $returnKey ? $bigger : $values[$bigger]['value'];
         }
     }