more scrutinizer fixes

Author: oscarotero

Embed/FastImage.php

@@ -10,6 +10,8 @@
  *
  * MIT Licensed
  * @version 0.1
+ *
+ * Modified for Embed library by Oscar Otero (https://github.com/oscarotero/Embed)
  */
 
 namespace Embed;
@@ -29,6 +31,11 @@ public function __construct($uri = null)
         }
     }
 
+    /**
+     * Opens an image stream
+     *
+     * @param string $uri
+     */
     public function load($uri)
     {
         if ($this->handle) {
@@ -48,21 +55,37 @@ public function load($uri)
         }
     }
 
+    /**
+     * Closes the stream
+     */
     public function close()
     {
-        if ($this->handle) fclose($this->handle);
+        if ($this->handle) {
+            fclose($this->handle);
+        }
     }
 
+    /**
+     * Gets the image size
+     *
+     * @return array|false
+     */
     public function getSize()
     {
         $this->strpos = 0;
+
         if ($this->getType() && ($size = $this->parseSize())) {
             return array_values($size);
         }
 
         return false;
     }
 
+    /**
+     * Gets the image type
+     *
+     * @return string|false
+     */
     public function getType()
     {
         $this->strpos = 0;
@@ -88,6 +111,11 @@ public function getType()
         return $this->type;
     }
 
+    /**
+     * Parses the image type
+     *
+     * @return array|null
+     */
     private function parseSize()
     {
         $this->strpos = 0;
@@ -106,20 +134,35 @@ private function parseSize()
         return null;
     }
 
+    /**
+     * Parses the image size for PNG
+     *
+     * @return array
+     */
     private function parseSizeForPNG()
     {
         $chars = $this->getChars(25);
 
         return unpack("N*", substr($chars, 16, 8));
     }
 
+    /**
+     * Parses the image size for GIF
+     *
+     * @return array
+     */
     private function parseSizeForGIF()
     {
         $chars = $this->getChars(11);
 
         return unpack("S*", substr($chars, 6, 4));
     }
 
+    /**
+     * Parses the image size for BMP
+     *
+     * @return array
+     */
     private function parseSizeForBMP()
     {
         $chars = $this->getChars(29);
@@ -129,6 +172,11 @@ private function parseSizeForBMP()
         return (reset($type) == 40) ? unpack('L*', substr($chars, 4)) : unpack('L*', substr($chars, 4, 8));
     }
 
+    /**
+     * Parses the image size for JPEG
+     *
+     * @return array
+     */
     private function parseSizeForJPEG()
     {
         $state = null;
@@ -179,6 +227,13 @@ private function parseSizeForJPEG()
         }
     }
 
+    /**
+     * Gets the stream characters until a specific position
+     *
+     * @param integer $n The end position of characters
+     *
+     * @return false|string
+     */
     private function getChars($n)
     {
         $response = null;
@@ -206,6 +261,11 @@ private function getChars($n)
         return mb_convert_encoding($result, "8BIT");
     }
 
+    /**
+     * Returns the current byte
+     *
+     * @return false|string
+     */
     private function getByte()
     {
         $c = $this->getChars(1);
@@ -214,18 +274,30 @@ private function getByte()
         return reset($b);
     }
 
+    /**
+     * Returns an integer
+     *
+     * @return integer
+     */
     private function readInt($str)
     {
         $size = unpack("C*", $str);
 
-            return ($size[1] << 8) + $size[2];
+        return ($size[1] << 8) + $size[2];
     }
 
     public function __destruct()
     {
         $this->close();
     }
 
+    /**
+     * Sort an array of images by their size
+     *
+     * @param array $images
+     *
+     * @return array
+     */
     public static function sortImagesBySize(array $images)
     {
         if (count($images) < 2) {

Embed/Providers/OpenGraph.php

@@ -76,29 +76,19 @@ public function getType()
     public function getCode()
     {
         if ($this->has('video')) {
-            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':
-                        $image = $this->getImage();
-
-                        if (is_array($image)) {
-                            $image = current($image);
-                        }
-
-                        return Viewers::videoHtml($image, $this->get('video'), $this->getWidth(), $this->getHeight());
-                }
+            if (!($videoPath = parse_url($this->get('video'), PHP_URL_PATH)) || !($type = pathinfo($videoPath, PATHINFO_EXTENSION))) {
+                $type = $this->get('video:type');
             }
-
-            switch ($this->get('video:type')) {
+            
+            switch ($type) {
+                case 'swf':
                 case 'application/x-shockwave-flash':
                     return Viewers::flash($this->get('video'), $this->getWidth(), $this->getHeight());
 
+                case 'mp4':
+                case 'ogg':
+                case 'ogv':
+                case 'webm':
                 case 'application/mp4':
                 case 'video/mp4':
                 case 'video/ogg':

Embed/Providers/Provider.php

@@ -29,7 +29,7 @@ public function set($name, $value = null)
      * @param null|string $name    Value name
      * @param null|string $subname A subvalue name
      *
-     * @return string/null
+     * @return string|null
      */
     public function get($name = null, $subname = null)
     {

Embed/RequestResolvers/Curl.php

@@ -112,7 +112,7 @@ public function getRequestInfo()
      *
      * @param string $name Parameter name
      *
-     * @return array/string The result info
+     * @return array|string The result info
      */
     protected function getResult($name)
     {

Embed/Url.php

@@ -45,19 +45,19 @@ public function getUrl()
     /**
      * Check if the url match with a specific pattern. The patterns only accepts * and ?
      *
-     * @param string/array $pattern The pattern or an array with various patterns
+     * @param string|array $patterns The pattern or an array with various patterns
      *
      * @return boolean True if the url match, false if not
      */
-    public function match($pattern)
+    public function match($patterns)
     {
         $url = $this->getUrl();
 
-        if (!is_array($pattern)) {
-            $pattern = array($pattern);
+        if (!is_array($patterns)) {
+            $patterns = array($patterns);
         }
 
-        foreach ($pattern as $pattern) {
+        foreach ($patterns as $pattern) {
             $pattern = str_replace(array('\\*', '\\?'), array('.+', '?'), preg_quote($pattern, '|'));
 
             if (preg_match('|^'.$pattern.'$|i', $url)) {