Fixed bug from scrutinizer

Author: oscarotero

Embed/Adapters/Adapter.php

@@ -1,9 +1,27 @@
 <?php
 /**
- * Base Adapter extended by all adapters
+ * Base class extended by all adapters
  *
- * Provide default functionalities
+ * @property $title
+ * @property $description
+ * @property $url
+ * @property $type
+ * @property $images
+ * @property $image
+ * @property $imageWidth
+ * @property $imageHeight
+ * @property $code
+ * @property $width
+ * @property $height
+ * @property $aspectRatio
+ * @property $authorName
+ * @property $authorUrl
+ * @property $providerIcons
+ * @property $providerIcon
+ * @property $providerName
+ * @property $providerUrl
  */
+
 namespace Embed\Adapters;
 
 use Embed\Request;

Embed/Adapters/File.php

@@ -37,7 +37,7 @@ class File extends Adapter implements AdapterInterface
 
     public static function check(Request $request)
     {
-        return isset(static::$contentTypes[$request->getMimeType()]);
+        return isset(self::$contentTypes[$request->getMimeType()]);
     }
 
     protected function initProviders(Request $request)
@@ -51,12 +51,12 @@ protected function initProviders(Request $request)
 
     public function getType()
     {
-        return static::$contentTypes[$this->request->getMimeType()][0];
+        return self::$contentTypes[$this->request->getMimeType()][0];
     }
 
     public function getCode()
     {
-        switch (static::$contentTypes[$this->request->getMimeType()][1]) {
+        switch (self::$contentTypes[$this->request->getMimeType()][1]) {
             case 'videoHtml':
                 return Viewers::videoHtml($this->getImage(), $this->getUrl(), $this->getWidth(), $this->getHeight());
 

Embed/Adapters/Webpage.php

@@ -6,14 +6,7 @@
 
 use Embed\Request;
 use Embed\FastImage;
-
-use Embed\Providers\Html;
-use Embed\Providers\OEmbed;
-use Embed\Providers\OEmbedImplementations;
-use Embed\Providers\OpenGraph;
-use Embed\Providers\TwitterCards;
-use Embed\Providers\Facebook;
-use Embed\Providers\Embedly;
+use Embed\Providers;
 
 class Webpage extends Adapter implements AdapterInterface
 {
@@ -27,17 +20,17 @@ protected function initProviders(Request $request)
         $this->request = $request;
 
         $this->providers = array(
-            'Html' => new Html($request),
-            'Facebook' => new Facebook($request),
-            'TwitterCards' => new TwitterCards($request),
-            'OpenGraph' => new OpenGraph($request)
+            'Html' => new Providers\Html($request),
+            'Facebook' => new Providers\Facebook($request),
+            'TwitterCards' => new Providers\TwitterCards($request),
+            'OpenGraph' => new Providers\OpenGraph($request)
         );
 
         if ($this->providers['Html']->get('oembed')) {
-            $this->providers['OEmbed'] = new OEmbed(new Request($request->getAbsolute($this->providers['Html']->get('oembed'))));
-        } elseif (($oEmbed = OEmbedImplementations::create($request))) {
+            $this->providers['OEmbed'] = new Providers\OEmbed(new Request($request->getAbsolute($this->providers['Html']->get('oembed'))));
+        } elseif (($oEmbed = Providers\OEmbedImplementations::create($request))) {
             $this->providers['OEmbed'] = $oEmbed;
-        } elseif ($this->options['embedlyKey'] && ($oEmbed = Embedly::create($request, $this->options['embedlyKey']))) {
+        } elseif ($this->options['embedlyKey'] && ($oEmbed = Providers\Embedly::create($request, $this->options['embedlyKey']))) {
             $this->providers['OEmbed'] = $oEmbed;
         }
 

Embed/Providers/OEmbed.php

@@ -32,7 +32,6 @@ public function __construct(Request $request)
 
             default:
                 throw new \Exception("No valid format specified");
-                break;
         }
 
     }

Embed/Providers/OpenGraph.php

@@ -76,15 +76,17 @@ public function getType()
     public function getCode()
     {
         if ($this->has('video')) {
-            switch (pathinfo(parse_url($this->get('video'), PHP_URL_PATH), PATHINFO_EXTENSION)) {
-                case 'swf':
-                    return Viewers::flash($this->get('video'), $this->getWidth(), $this->getHeight());
-
-                case 'mp4':
-                case 'ogg':
-                case 'ogv':
-                case 'webm':
-                    return Viewers::videoHtml($this->getImage(), $this->get('video'), $this->getWidth(), $this->getHeight());
+            if (($videoPath = parse_url($this->get('video'), PHP_URL_PATH))) {
+                switch (pathinfo($videoPath, PATHINFO_EXTENSION)) {
+                    case 'swf':
+                        return Viewers::flash($this->get('video'), $this->getWidth(), $this->getHeight());
+
+                    case 'mp4':
+                    case 'ogg':
+                    case 'ogv':
+                    case 'webm':
+                        return Viewers::videoHtml($this->getImage(), $this->get('video'), $this->getWidth(), $this->getHeight());
+                }
             }
 
             switch ($this->get('video:type')) {

Embed/Providers/Provider.php

@@ -12,7 +12,7 @@ class Provider
      * Save a value
      *
      * @param string $name  Name of the value
-     * @param string $value The value to save
+     * @param mixed $value The value to save
      */
     public function set($name, $value = null)
     {

Embed/RequestResolvers/Curl.php

@@ -151,8 +151,8 @@ protected function resolve()
 
             $charset = substr(strtoupper(strstr($charset, '=')), 1);
 
-            if (!empty($charset) && ($charset !== 'UTF-8')) {
-                $content = @mb_convert_encoding($content, 'UTF-8', $charset);
+            if (!empty($charset) && !empty($this->content) && ($charset !== 'UTF-8')) {
+                $this->content = @mb_convert_encoding($this->content, 'UTF-8', $charset);
             }
         } elseif (strpos($this->getResult('content_type'), '/') !== false) {
             $this->result['mime_type'] = $this->result['content_type'];

Embed/Url.php

@@ -285,7 +285,7 @@ public function getFragmentArray()
      */
     public function setFragment($fragment)
     {
-        $this->info['fragment'];
+        $this->info['fragment'] = $fragment;
     }
 
 

test-sources.php

@@ -87,7 +87,7 @@
             <tr>
                 <th>Content</th>
                 <td>
-                    <pre><?php echo htmlspecialchars($url->getContent(), ENT_IGNORE); ?></pre>
+                    <pre><?php echo htmlspecialchars($request->getContent(), ENT_IGNORE); ?></pre>
                 </td>
             </tr>
         </table>