samayo / bulletproof

src/bulletproof.php

Braces +20 added lines, -39 removed lines

@@ -102,8 +102,7 @@ 
     /**

      * @param array $_files represents the $_FILES array passed as dependancy

      */

-    public function __construct(array $_files = [])

-    {

+    public function __construct(array $_files = []) {
         $this->_files = $_files;

     }

 

@@ -114,8 +113,7 @@ 
      *

      * @return bool|string

      */

-    protected function getImageMime($tmp_name)

-    {

+    protected function getImageMime($tmp_name) {
         if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {

             return $this->imageMimes [exif_imagetype($tmp_name)];

         }

@@ -137,8 +135,7 @@ 
      *

      * @return bool|mixed

      */

-    public function offsetGet($offset)

-    {

+    public function offsetGet($offset) {
         if ($offset == "error") {

             return $this->error;

         }

@@ -158,8 +155,7 @@ 
      *

      * @return $this

      */

-    public function setName($isNameProvided = null)

-    {

+    public function setName($isNameProvided = null) {
         if ($isNameProvided) {

             $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);

         }

@@ -174,8 +170,7 @@ 
      *

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

+    public function setMime(array $fileTypes) {
         $this->mimeTypes = $fileTypes;

         return $this;

     }

@@ -188,8 +183,7 @@ 
      *

      * @return $this

      */

-    public function setSize($min, $max)

-    {

+    public function setSize($min, $max) {
         $this->size = array($min, $max);

         return $this;

     }

@@ -202,8 +196,7 @@ 
      *

      * @return $this

      */

-    public function setLocation($dir = "bulletproof", $permission = 0666)

-    {

+    public function setLocation($dir = "bulletproof", $permission = 0666) {
         if (!file_exists($dir) && !is_dir($dir) && !$this->location) {

             $createFolder = @mkdir("" . $dir, (int) $permission, true);

             if (!$createFolder) {

@@ -224,8 +217,7 @@ 
      *

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

+    public function setDimension($maxWidth, $maxHeight) {
         $this->dimensions = array($maxWidth, $maxHeight);

         return $this;

     }

@@ -235,8 +227,7 @@ 
      *

      * @return string

      */

-    public function getName()

-    {

+    public function getName() {
         if (!$this->name) {

            return  uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));

         }

@@ -249,8 +240,7 @@ 
      *

      * @return string

      */

-    public function getFullPath()

-    {

+    public function getFullPath() {
         $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime;

         return $this->fullPath;

     }

@@ -260,8 +250,7 @@ 
      *

      * @return int

      */

-    public function getSize()

-    {

+    public function getSize() {
         return (int) $this->_files["size"];

     }

 

@@ -270,8 +259,7 @@ 
      *

      * @return int

      */

-    public function getHeight()

-    {

+    public function getHeight() {
         if ($this->height != null) {

             return $this->height;

         }

@@ -285,8 +273,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

+    public function getWidth() {
         if ($this->width != null) {

             return $this->width;

         }

@@ -300,8 +287,7 @@ 
      *

      * @return string

      */

-    public function getLocation()

-    {

+    public function getLocation() {
         if(!$this->location){

             $this->setLocation(); 

         }

@@ -314,8 +300,7 @@ 
      *

      * @return string

      */

-    public function getJson()

-    {

+    public function getJson() {
         return json_encode($this->serialize);

     }

 

@@ -324,8 +309,7 @@ 
      *

      * @return string

      */

-    public function getMime()

-    {

+    public function getMime() {
         return $this->mime;

     }

 

@@ -334,7 +318,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {
         return $this->error;

     }

 

@@ -343,8 +327,7 @@ 
      *

      * @param $e int error constant

      */

-    protected function uploadErrors($e)

-    {

+    protected function uploadErrors($e) {
         $errors = array(

             UPLOAD_ERR_OK           => 0,

             UPLOAD_ERR_INI_SIZE     => Image::IMAGE_ERR_INI_SIZE,

@@ -364,8 +347,7 @@ 
      *

      * @return $this|bool

      */

-    public function upload()

-    {

+    public function upload() {
         /* modify variable names for convenience */

         $image = $this; 

         $files = $this->_files;

@@ -448,8 +430,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

+    public function moveUploadedFile($tmp_name, $destination) {
         return move_uploaded_file($tmp_name, $destination);

     }

 }

Doc Comments +3 added lines, -5 removed lines

@@ -121,7 +121,7 @@ 
      *

      * @param mixed $offset

      *

-     * @return bool|mixed

+     * @return string|boolean

      */

     public function offsetGet($offset)

     {

@@ -140,8 +140,6 @@ 
     /**

      * Renames image

      *

-     * @param null $isNameGiven if null, image will be auto-generated

-     *

      * @return $this

      */

     public function setName($isNameProvided = null)

@@ -318,7 +316,7 @@ 
     /**

      * Returns error string or false if no errors occurred

      *

-     * @return string|bool

+     * @return string|false

      */

     public function getError(){

         return $this->error != "" ? $this->error : false;

@@ -430,7 +428,7 @@ 
      * Final upload method to be called, isolated for testing purposes

      *

      * @param $tmp_name int the temporary location of the image file

-     * @param $destination int upload destination

+     * @param string $destination int upload destination

      *

      * @return bool

      */

Spacing +17 added lines, -17 removed lines

@@ -112,9 +112,9 @@ 
      * array offset \ArrayAccess

      * unused

      */

-    public function offsetSet($offset, $value){}

-    public function offsetExists($offset){}

-    public function offsetUnset($offset){}

+    public function offsetSet($offset, $value) {}

+    public function offsetExists($offset) {}

+    public function offsetUnset($offset) {}

 

     /**

      * Gets array value \ArrayAccess

@@ -191,9 +191,9 @@ 
     public function setLocation($dir = "bulletproof", $permission = 0666)

     {

         if (!file_exists($dir) && !is_dir($dir) && !$this->location) {

-            $createFolder = @mkdir("" . $dir, (int) $permission, true);

+            $createFolder = @mkdir("".$dir, (int) $permission, true);

             if (!$createFolder) {

-                $this->error = "Folder " . $dir . " could not be created";

+                $this->error = "Folder ".$dir." could not be created";

                 return;

             }

         }

@@ -224,7 +224,7 @@ 
     public function getName()

     {

         if (!$this->name) {

-           return  uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));

+           return  uniqid(true)."_".str_shuffle(implode(range("e", "q")));

         }

 

         return $this->name;

@@ -237,7 +237,7 @@ 
      */

     public function getFullPath()

     {

-        $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime;

+        $this->fullPath = $this->location."/".$this->name.".".$this->mime;

         return $this->fullPath;

     }

 

@@ -288,7 +288,7 @@ 
      */

     public function getLocation()

     {

-        if(!$this->location){

+        if (!$this->location) {

             $this->setLocation(); 

         }

 

@@ -320,7 +320,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {

         return $this->error != "" ? $this->error : false;

     }

 

@@ -366,8 +366,8 @@ 
         list($minSize, $maxSize) = $image->size;

 

         /* check for common upload errors */

-        if($image->error = $image->uploadErrors($files["error"])){

-            return ;

+        if ($image->error = $image->uploadErrors($files["error"])) {

+            return;

         }

 

         /* check image for valid mime types and return mime */

@@ -377,7 +377,7 @@ 
         if (!in_array($image->mime, $image->mimeTypes)) {

             $ext = implode(", ", $image->mimeTypes);

             $image->error = "Invalid File! Only ($ext) image types are allowed";

-            return ;

+            return;

         }     

 

         /* check image size based on the settings */

@@ -385,7 +385,7 @@ 
             $min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000);

             

             $image->error = "Image size should be atleast more than min: $min and less than max: $max kb";

-            return ;

+            return;

         }

 

         /* check image dimension */

@@ -393,16 +393,16 @@ 
 

         if ($image->height > $allowedHeight || $image->width > $allowedWidth) {

             $image->error = "Image height/width should be less than ' $allowedHeight \ $allowedWidth ' pixels";

-            return ;

+            return;

         }

 

-        if($image->height < 4 || $image->width < 4){

+        if ($image->height < 4 || $image->width < 4) {

             $image->error = "Invalid! Image height/width is too small or maybe corrupted"; 

-            return ;

+            return;

         }

  

         /* set and get folder name */

-        $image->fullPath = $image->location. "/" . $image->name . "." . $image->mime;

+        $image->fullPath = $image->location."/".$image->name.".".$image->mime;

 

         /* gather image info for json storage */ 

         $image->serialize = array(

Indentation +417 added lines, -417 removed lines

@@ -16,426 +16,426 @@
 

 class Image implements \ArrayAccess

 {

-    /**

-     * @var string The new image name, to be provided or will be generated.

-     */

-    protected $name;

-

-    /**

-     * @var int The image width in pixels

-     */

-    protected $width;

-

-    /**

-     * @var int The image height in pixels

-     */

-    protected $height;

-

-    /**

-     * @var string The image mime type (extension)

-     */

-    protected $mime;

-

-    /**

-     * @var string The full image path (dir + image + mime)

-     */

-    protected $fullPath;

-

-    /**

-     * @var string The folder or image storage location

-     */

-    protected $location;

-

-    /**

-     * @var array A json format of all information about an image

-     */

-    protected $serialize = array();

-

-    /**

-     * @var array The min and max image size allowed for upload (in bytes)

-     */

-    protected $size = array(100, 50000);

-

-    /**

-     * @var array The max height and width image allowed

-     */

-    protected $dimensions = array(500, 5000);

-

-    /**

-     * @var array The mime types allowed for upload

-     */

-    protected $mimeTypes = array("jpeg", "png", "gif");

-

-    /**

-     * @var array list of known image types

-     */

-    protected $imageMimes = array(

-        1 => "gif", "jpeg", "png", "swf", "psd",

-        "bmp", "tiff", "tiff", "jpc", "jp2", "jpx",

-        "jb2", "swc", "iff", "wbmp", "xbm", "ico"

-    );

-

-    /**

-     * @var array storage for the $_FILES global array

-     */

-    private $_files = array();

-

-    /**

-     * @var string storage for any errors

-     */

-    private $error = "";

-

-    /**

-     * @param array $_files represents the $_FILES array passed as dependancy

-     */

-    public function __construct(array $_files = [])

-    {

-        $this->_files = $_files;

-    }

-

-    /**

-     * Gets the real image mime type

-     *

-     * @param $tmp_name string The upload tmp directory

-     *

-     * @return bool|string

-     */

-    protected function getImageMime($tmp_name)

-    {

-        if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {

-            return $this->imageMimes [exif_imagetype($tmp_name)];

-        }

-        return false;

-    }

-

-    /**

-     * array offset \ArrayAccess

-     * unused

-     */

-    public function offsetSet($offset, $value){}

-    public function offsetExists($offset){}

-    public function offsetUnset($offset){}

-

-    /**

-     * Gets array value \ArrayAccess

-     *

-     * @param mixed $offset

-     *

-     * @return bool|mixed

-     */

-    public function offsetGet($offset)

-    {

-        if ($offset == "error") {

-            return $this->error;

-        }

-

-        if (isset($this->_files[$offset]) && file_exists($this->_files[$offset]["tmp_name"])) {

-            $this->_files = $this->_files[$offset];

-            return true;

-        }

+	/**

+	 * @var string The new image name, to be provided or will be generated.

+	 */

+	protected $name;

+

+	/**

+	 * @var int The image width in pixels

+	 */

+	protected $width;

+

+	/**

+	 * @var int The image height in pixels

+	 */

+	protected $height;

+

+	/**

+	 * @var string The image mime type (extension)

+	 */

+	protected $mime;

+

+	/**

+	 * @var string The full image path (dir + image + mime)

+	 */

+	protected $fullPath;

+

+	/**

+	 * @var string The folder or image storage location

+	 */

+	protected $location;

+

+	/**

+	 * @var array A json format of all information about an image

+	 */

+	protected $serialize = array();

+

+	/**

+	 * @var array The min and max image size allowed for upload (in bytes)

+	 */

+	protected $size = array(100, 50000);

+

+	/**

+	 * @var array The max height and width image allowed

+	 */

+	protected $dimensions = array(500, 5000);

+

+	/**

+	 * @var array The mime types allowed for upload

+	 */

+	protected $mimeTypes = array("jpeg", "png", "gif");

+

+	/**

+	 * @var array list of known image types

+	 */

+	protected $imageMimes = array(

+		1 => "gif", "jpeg", "png", "swf", "psd",

+		"bmp", "tiff", "tiff", "jpc", "jp2", "jpx",

+		"jb2", "swc", "iff", "wbmp", "xbm", "ico"

+	);

+

+	/**

+	 * @var array storage for the $_FILES global array

+	 */

+	private $_files = array();

+

+	/**

+	 * @var string storage for any errors

+	 */

+	private $error = "";

+

+	/**

+	 * @param array $_files represents the $_FILES array passed as dependancy

+	 */

+	public function __construct(array $_files = [])

+	{

+		$this->_files = $_files;

+	}

+

+	/**

+	 * Gets the real image mime type

+	 *

+	 * @param $tmp_name string The upload tmp directory

+	 *

+	 * @return bool|string

+	 */

+	protected function getImageMime($tmp_name)

+	{

+		if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {

+			return $this->imageMimes [exif_imagetype($tmp_name)];

+		}

+		return false;

+	}

+

+	/**

+	 * array offset \ArrayAccess

+	 * unused

+	 */

+	public function offsetSet($offset, $value){}

+	public function offsetExists($offset){}

+	public function offsetUnset($offset){}

+

+	/**

+	 * Gets array value \ArrayAccess

+	 *

+	 * @param mixed $offset

+	 *

+	 * @return bool|mixed

+	 */

+	public function offsetGet($offset)

+	{

+		if ($offset == "error") {

+			return $this->error;

+		}

+

+		if (isset($this->_files[$offset]) && file_exists($this->_files[$offset]["tmp_name"])) {

+			$this->_files = $this->_files[$offset];

+			return true;

+		}

         

-        return false;

-    }

-

-    /**

-     * Renames image

-     *

-     * @param null $isNameGiven if null, image will be auto-generated

-     *

-     * @return $this

-     */

-    public function setName($isNameProvided = null)

-    {

-        if ($isNameProvided) {

-            $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);

-        }

+		return false;

+	}

+

+	/**

+	 * Renames image

+	 *

+	 * @param null $isNameGiven if null, image will be auto-generated

+	 *

+	 * @return $this

+	 */

+	public function setName($isNameProvided = null)

+	{

+		if ($isNameProvided) {

+			$this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);

+		}

         

-        return $this;

-    }

-

-    /**

-     * Define a mime type for uploading

-     *

-     * @param array $fileTypes

-     *

-     * @return $this

-     */

-    public function setMime(array $fileTypes)

-    {

-        $this->mimeTypes = $fileTypes;

-        return $this;

-    }

-

-    /**

-     * Define a min and max image size for uploading

-     *

-     * @param $min int minimum value in bytes

-     * @param $max int maximum value in bytes

-     *

-     * @return $this

-     */

-    public function setSize($min, $max)

-    {

-        $this->size = array($min, $max);

-        return $this;

-    }

-

-    /**

-     * Creates a location for upload storage

-     *

-     * @param $dir string the folder name to create

-     * @param int $permission chmod permission

-     *

-     * @return $this

-     */

-    public function setLocation($dir = "bulletproof", $permission = 0666)

-    {

-        if (!file_exists($dir) && !is_dir($dir) && !$this->location) {

-            $createFolder = @mkdir("" . $dir, (int) $permission, true);

-            if (!$createFolder) {

-                $this->error = "Folder " . $dir . " could not be created";

-                return;

-            }

-        }

-

-        $this->location = $dir;

-        return $this;

-    }

-

-    /**

-     * Sets acceptable max image height and width

-     *

-     * @param $maxWidth int max width value

-     * @param $maxHeight int max height value

-     *

-     * @return $this

-     */

-    public function setDimension($maxWidth, $maxHeight)

-    {

-        $this->dimensions = array($maxWidth, $maxHeight);

-        return $this;

-    }

-

-    /**

-     * Returns the image name

-     *

-     * @return string

-     */

-    public function getName()

-    {

-        if (!$this->name) {

-           return  uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));

-        }

-

-        return $this->name;

-    }

-

-    /**

-     * Returns the full path of the image ex "location/image.mime"

-     *

-     * @return string

-     */

-    public function getFullPath()

-    {

-        $this->fullPath = $this->location . "/" . $this->name . "." . $this->mime;

-        return $this->fullPath;

-    }

-

-    /**

-     * Returns the image size in bytes

-     *

-     * @return int

-     */

-    public function getSize()

-    {

-        return (int) $this->_files["size"];

-    }

-

-    /**

-     * Returns the image height in pixels

-     *

-     * @return int

-     */

-    public function getHeight()

-    {

-        if ($this->height != null) {

-            return $this->height;

-        }

-

-        list(, $height) = getImageSize($this->_files["tmp_name"]); 

-        return $height;

-    }

-

-    /**

-     * Returns the image width

-     *

-     * @return int

-     */

-    public function getWidth()

-    {

-        if ($this->width != null) {

-            return $this->width;

-        }

-

-        list($width) = getImageSize($this->_files["tmp_name"]); 

-        return $width;

-    }

-

-    /**

-     * Returns the storage / folder name

-     *

-     * @return string

-     */

-    public function getLocation()

-    {

-        if(!$this->location){

-            $this->setLocation(); 

-        }

-

-        return $this->location; 

-    }

-

-    /**

-     * Returns a JSON format of the image width, height, name, mime ...

-     *

-     * @return string

-     */

-    public function getJson()

-    {

-        return json_encode($this->serialize);

-    }

-

-    /**

-     * Returns the image mime type

-     *

-     * @return string

-     */

-    public function getMime()

-    {

-        return $this->mime;

-    }

-

-    /**

-     * Returns error string or false if no errors occurred

-     *

-     * @return string|bool

-     */

-    public function getError(){

-        return $this->error != "" ? $this->error : false;

-    }

-

-    /**

-     * Checks for the common upload errors

-     *

-     * @param $e int error constant

-     */

-    protected function uploadErrors($e)

-    {

-        $errors = array(

-            UPLOAD_ERR_OK           => "",

-            UPLOAD_ERR_INI_SIZE     => "Image is larger than the specified amount set by the server",

-            UPLOAD_ERR_FORM_SIZE    => "Image is larger than the specified amount specified by browser",

-            UPLOAD_ERR_PARTIAL      => "Image could not be fully uploaded. Please try again later",

-            UPLOAD_ERR_NO_FILE      => "Image is not found",

-            UPLOAD_ERR_NO_TMP_DIR   => "Can't write to disk, due to server configuration ( No tmp dir found )",

-            UPLOAD_ERR_CANT_WRITE   => "Failed to write file to disk. Please check you file permissions",

-            UPLOAD_ERR_EXTENSION    => "A PHP extension has halted this file upload process"

-        );

-        return $errors[$e];

-    }

-

-    /**

-     * Main upload method.

-     * This is where all the monkey business happens

-     *

-     * @return $this|bool

-     */

-    public function upload()

-    {

-        /* modify variable names for convenience */

-        $image = $this; 

-        $files = $this->_files;

-

-        /* initialize image properties */

-        $image->name     = $image->getName();

-        $image->width    = $image->getWidth();

-        $image->height   = $image->getHeight(); 

-        $image->location = $image->getLocation();

-

-        /* get image sizes */

-        list($minSize, $maxSize) = $image->size;

-

-        /* check for common upload errors */

-        if($image->error = $image->uploadErrors($files["error"])){

-            return ;

-        }

-

-        /* check image for valid mime types and return mime */

-        $image->mime = $image->getImageMime($files["tmp_name"]);

-

-        /* validate image mime type */

-        if (!in_array($image->mime, $image->mimeTypes)) {

-            $ext = implode(", ", $image->mimeTypes);

-            $image->error = "Invalid File! Only ($ext) image types are allowed";

-            return ;

-        }     

-

-        /* check image size based on the settings */

-        if ($files["size"] < $minSize || $files["size"] > $maxSize) {

-            $min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000);

+		return $this;

+	}

+

+	/**

+	 * Define a mime type for uploading

+	 *

+	 * @param array $fileTypes

+	 *

+	 * @return $this

+	 */

+	public function setMime(array $fileTypes)

+	{

+		$this->mimeTypes = $fileTypes;

+		return $this;

+	}

+

+	/**

+	 * Define a min and max image size for uploading

+	 *

+	 * @param $min int minimum value in bytes

+	 * @param $max int maximum value in bytes

+	 *

+	 * @return $this

+	 */

+	public function setSize($min, $max)

+	{

+		$this->size = array($min, $max);

+		return $this;

+	}

+

+	/**

+	 * Creates a location for upload storage

+	 *

+	 * @param $dir string the folder name to create

+	 * @param int $permission chmod permission

+	 *

+	 * @return $this

+	 */

+	public function setLocation($dir = "bulletproof", $permission = 0666)

+	{

+		if (!file_exists($dir) && !is_dir($dir) && !$this->location) {

+			$createFolder = @mkdir("" . $dir, (int) $permission, true);

+			if (!$createFolder) {

+				$this->error = "Folder " . $dir . " could not be created";

+				return;

+			}

+		}

+

+		$this->location = $dir;

+		return $this;

+	}

+

+	/**

+	 * Sets acceptable max image height and width

+	 *

+	 * @param $maxWidth int max width value

+	 * @param $maxHeight int max height value

+	 *

+	 * @return $this

+	 */

+	public function setDimension($maxWidth, $maxHeight)

+	{

+		$this->dimensions = array($maxWidth, $maxHeight);

+		return $this;

+	}

+

+	/**

+	 * Returns the image name

+	 *

+	 * @return string

+	 */

+	public function getName()

+	{

+		if (!$this->name) {

+		   return  uniqid(true) . "_" . str_shuffle(implode(range("e", "q")));

+		}

+

+		return $this->name;

+	}

+

+	/**

+	 * Returns the full path of the image ex "location/image.mime"

+	 *

+	 * @return string

+	 */

+	public function getFullPath()

+	{

+		$this->fullPath = $this->location . "/" . $this->name . "." . $this->mime;

+		return $this->fullPath;

+	}

+

+	/**

+	 * Returns the image size in bytes

+	 *

+	 * @return int

+	 */

+	public function getSize()

+	{

+		return (int) $this->_files["size"];

+	}

+

+	/**

+	 * Returns the image height in pixels

+	 *

+	 * @return int

+	 */

+	public function getHeight()

+	{

+		if ($this->height != null) {

+			return $this->height;

+		}

+

+		list(, $height) = getImageSize($this->_files["tmp_name"]); 

+		return $height;

+	}

+

+	/**

+	 * Returns the image width

+	 *

+	 * @return int

+	 */

+	public function getWidth()

+	{

+		if ($this->width != null) {

+			return $this->width;

+		}

+

+		list($width) = getImageSize($this->_files["tmp_name"]); 

+		return $width;

+	}

+

+	/**

+	 * Returns the storage / folder name

+	 *

+	 * @return string

+	 */

+	public function getLocation()

+	{

+		if(!$this->location){

+			$this->setLocation(); 

+		}

+

+		return $this->location; 

+	}

+

+	/**

+	 * Returns a JSON format of the image width, height, name, mime ...

+	 *

+	 * @return string

+	 */

+	public function getJson()

+	{

+		return json_encode($this->serialize);

+	}

+

+	/**

+	 * Returns the image mime type

+	 *

+	 * @return string

+	 */

+	public function getMime()

+	{

+		return $this->mime;

+	}

+

+	/**

+	 * Returns error string or false if no errors occurred

+	 *

+	 * @return string|bool

+	 */

+	public function getError(){

+		return $this->error != "" ? $this->error : false;

+	}

+

+	/**

+	 * Checks for the common upload errors

+	 *

+	 * @param $e int error constant

+	 */

+	protected function uploadErrors($e)

+	{

+		$errors = array(

+			UPLOAD_ERR_OK           => "",

+			UPLOAD_ERR_INI_SIZE     => "Image is larger than the specified amount set by the server",

+			UPLOAD_ERR_FORM_SIZE    => "Image is larger than the specified amount specified by browser",

+			UPLOAD_ERR_PARTIAL      => "Image could not be fully uploaded. Please try again later",

+			UPLOAD_ERR_NO_FILE      => "Image is not found",

+			UPLOAD_ERR_NO_TMP_DIR   => "Can't write to disk, due to server configuration ( No tmp dir found )",

+			UPLOAD_ERR_CANT_WRITE   => "Failed to write file to disk. Please check you file permissions",

+			UPLOAD_ERR_EXTENSION    => "A PHP extension has halted this file upload process"

+		);

+		return $errors[$e];

+	}

+

+	/**

+	 * Main upload method.

+	 * This is where all the monkey business happens

+	 *

+	 * @return $this|bool

+	 */

+	public function upload()

+	{

+		/* modify variable names for convenience */

+		$image = $this; 

+		$files = $this->_files;

+

+		/* initialize image properties */

+		$image->name     = $image->getName();

+		$image->width    = $image->getWidth();

+		$image->height   = $image->getHeight(); 

+		$image->location = $image->getLocation();

+

+		/* get image sizes */

+		list($minSize, $maxSize) = $image->size;

+

+		/* check for common upload errors */

+		if($image->error = $image->uploadErrors($files["error"])){

+			return ;

+		}

+

+		/* check image for valid mime types and return mime */

+		$image->mime = $image->getImageMime($files["tmp_name"]);

+

+		/* validate image mime type */

+		if (!in_array($image->mime, $image->mimeTypes)) {

+			$ext = implode(", ", $image->mimeTypes);

+			$image->error = "Invalid File! Only ($ext) image types are allowed";

+			return ;

+		}     

+

+		/* check image size based on the settings */

+		if ($files["size"] < $minSize || $files["size"] > $maxSize) {

+			$min = intval($minSize / 1000) ?: 1; $max = intval($maxSize / 1000);

             

-            $image->error = "Image size should be atleast more than min: $min and less than max: $max kb";

-            return ;

-        }

-

-        /* check image dimension */

-        list($allowedWidth, $allowedHeight) = $image->dimensions;

-

-        if ($image->height > $allowedHeight || $image->width > $allowedWidth) {

-            $image->error = "Image height/width should be less than ' $allowedHeight \ $allowedWidth ' pixels";

-            return ;

-        }

-

-        if($image->height < 4 || $image->width < 4){

-            $image->error = "Invalid! Image height/width is too small or maybe corrupted"; 

-            return ;

-        }

+			$image->error = "Image size should be atleast more than min: $min and less than max: $max kb";

+			return ;

+		}

+

+		/* check image dimension */

+		list($allowedWidth, $allowedHeight) = $image->dimensions;

+

+		if ($image->height > $allowedHeight || $image->width > $allowedWidth) {

+			$image->error = "Image height/width should be less than ' $allowedHeight \ $allowedWidth ' pixels";

+			return ;

+		}

+

+		if($image->height < 4 || $image->width < 4){

+			$image->error = "Invalid! Image height/width is too small or maybe corrupted"; 

+			return ;

+		}

  

-        /* set and get folder name */

-        $image->fullPath = $image->location. "/" . $image->name . "." . $image->mime;

-

-        /* gather image info for json storage */ 

-        $image->serialize = array(

-            "name"     => $image->name,

-            "mime"     => $image->mime,

-            "height"   => $image->height,

-            "width"    => $image->width,

-            "size"     => $files["size"],

-            "location" => $image->location,

-            "fullpath" => $image->fullPath

-        );

-

-        if ($image->error === "") {

-            $moveUpload = $image->moveUploadedFile($files["tmp_name"], $image->fullPath);

-            if (false !== $moveUpload) {

-                return $image;

-            }

-        }

+		/* set and get folder name */

+		$image->fullPath = $image->location. "/" . $image->name . "." . $image->mime;

+

+		/* gather image info for json storage */ 

+		$image->serialize = array(

+			"name"     => $image->name,

+			"mime"     => $image->mime,

+			"height"   => $image->height,

+			"width"    => $image->width,

+			"size"     => $files["size"],

+			"location" => $image->location,

+			"fullpath" => $image->fullPath

+		);

+

+		if ($image->error === "") {

+			$moveUpload = $image->moveUploadedFile($files["tmp_name"], $image->fullPath);

+			if (false !== $moveUpload) {

+				return $image;

+			}

+		}

         

-        $image->error = "Upload failed, Unknown error occured";

-        return false;

-    }

-

-    /**

-     * Final upload method to be called, isolated for testing purposes

-     *

-     * @param $tmp_name int the temporary location of the image file

-     * @param $destination int upload destination

-     *

-     * @return bool

-     */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

-        return move_uploaded_file($tmp_name, $destination);

-    }

+		$image->error = "Upload failed, Unknown error occured";

+		return false;

+	}

+

+	/**

+	 * Final upload method to be called, isolated for testing purposes

+	 *

+	 * @param $tmp_name int the temporary location of the image file

+	 * @param $destination int upload destination

+	 *

+	 * @return bool

+	 */

+	public function moveUploadedFile($tmp_name, $destination)

+	{

+		return move_uploaded_file($tmp_name, $destination);

+	}

 }

src/utils/func.image-crop.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
  */

 namespace Bulletproof;

 

- function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){

+ function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight) {

 

     switch ($mimeType) {

         case "jpg":

@@ -37,7 +37,7 @@ 
     // Can't crop to a bigger size, ex: 

     // an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size.

     if ($widthTrim < 0 && $heightTrim < 0) {

-        return ;

+        return;

     }

 

     $temp = imagecreatetruecolor($newWidth, $newHeight);

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

- function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){

+ function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight) {
 

     switch ($mimeType) {

         case "jpg":

Indentation +41 added lines, -41 removed lines

@@ -11,55 +11,55 @@
 

  function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){

 

-    switch ($mimeType) {

-        case "jpg":

-        case "jpeg":

-            $imageCreate = imagecreatefromjpeg($image);

-            break;

+	switch ($mimeType) {

+		case "jpg":

+		case "jpeg":

+			$imageCreate = imagecreatefromjpeg($image);

+			break;

 

-        case "png":

-            $imageCreate = imagecreatefrompng($image);

-            break;

+		case "png":

+			$imageCreate = imagecreatefrompng($image);

+			break;

 

-        case "gif":

-            $imageCreate = imagecreatefromgif($image);

-            break;

+		case "gif":

+			$imageCreate = imagecreatefromgif($image);

+			break;

 

-        default:

-            throw new \Exception(" Only gif, jpg, jpeg and png files can be cropped ");

-            break;

-    }

+		default:

+			throw new \Exception(" Only gif, jpg, jpeg and png files can be cropped ");

+			break;

+	}

 

-    // The image offsets/coordination to crop the image.

-    $widthTrim = ceil(($imgWidth - $newWidth) / 2);

-    $heightTrim = ceil(($imgHeight - $newHeight) / 2);

+	// The image offsets/coordination to crop the image.

+	$widthTrim = ceil(($imgWidth - $newWidth) / 2);

+	$heightTrim = ceil(($imgHeight - $newHeight) / 2);

 

-    // Can't crop to a bigger size, ex: 

-    // an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size.

-    if ($widthTrim < 0 && $heightTrim < 0) {

-        return ;

-    }

+	// Can't crop to a bigger size, ex: 

+	// an image with 100X100 can not be cropped to 200X200. Image can only be cropped to smaller size.

+	if ($widthTrim < 0 && $heightTrim < 0) {

+		return ;

+	}

 

-    $temp = imagecreatetruecolor($newWidth, $newHeight);

-            imagecopyresampled(

-                $temp,

-                $imageCreate,

-                0,

-                0,

-                $widthTrim,

-                $heightTrim,

-                $newWidth,

-                $newHeight,

-                $newWidth,

-                $newHeight

-            );

+	$temp = imagecreatetruecolor($newWidth, $newHeight);

+			imagecopyresampled(

+				$temp,

+				$imageCreate,

+				0,

+				0,

+				$widthTrim,

+				$heightTrim,

+				$newWidth,

+				$newHeight,

+				$newWidth,

+				$newHeight

+			);

 

 

-    if (!$temp) {

-        throw new \Exception("Failed to crop image. Please pass the right parameters");

-    } else {

-        imagejpeg($temp, $image);

-    }

+	if (!$temp) {

+		throw new \Exception("Failed to crop image. Please pass the right parameters");

+	} else {

+		imagejpeg($temp, $image);

+	}

 

 }

 

src/utils/func.image-resize.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

-function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){           

+function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE) {           

     

     // First, calculate the height.

     $height = intval($newWidth / $imgWidth * $imgHeight);

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

-function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){           

+function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE) {
     

     // First, calculate the height.

     $height = intval($newWidth / $imgWidth * $imgHeight);

Indentation +65 added lines, -65 removed lines

@@ -11,79 +11,79 @@
 

 function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){           

     

-    // First, calculate the height.

-    $height = intval($newWidth / $imgWidth * $imgHeight);

+	// First, calculate the height.

+	$height = intval($newWidth / $imgWidth * $imgHeight);

 

-    // If the height is too large, set it to the maximum height and calculate the width.

-    if ($height > $newHeight) {

+	// If the height is too large, set it to the maximum height and calculate the width.

+	if ($height > $newHeight) {

 

-        $height = $newHeight;

-        $newWidth = intval($height / $imgHeight * $imgWidth);

-    }

+		$height = $newHeight;

+		$newWidth = intval($height / $imgHeight * $imgWidth);

+	}

 

-    // If we don't allow upsizing check if the new width or height are too big.

-    if (!$upsize) {

-        // If the given width is larger then the image height, then resize it.

-        if ($newWidth > $imgWidth) {

-            $newWidth = $imgWidth;

-            $height = intval($newWidth / $imgWidth * $imgHeight);

-        }

+	// If we don't allow upsizing check if the new width or height are too big.

+	if (!$upsize) {

+		// If the given width is larger then the image height, then resize it.

+		if ($newWidth > $imgWidth) {

+			$newWidth = $imgWidth;

+			$height = intval($newWidth / $imgWidth * $imgHeight);

+		}

 

-        // If the given height is larger then the image height, then resize it.

-        if ($height > $imgHeight) {

-            $height = $imgHeight;

-            $newWidth = intval($height / $imgHeight * $imgWidth);

-        }

-    }

+		// If the given height is larger then the image height, then resize it.

+		if ($height > $imgHeight) {

+			$height = $imgHeight;

+			$newWidth = intval($height / $imgHeight * $imgWidth);

+		}

+	}

 

-    if ($ratio == true)

-    {

-        $source_aspect_ratio = $imgWidth / $imgHeight;

-        $thumbnail_aspect_ratio = $newWidth / $newHeight;

-        if ($imgWidth <= $newWidth && $imgHeight <= $newHeight) {

-            $newWidth = $imgWidth;

-            $newHeight = $imgHeight;

-        } elseif ($thumbnail_aspect_ratio > $source_aspect_ratio) {

-            $newWidth = (int) ($newHeight * $source_aspect_ratio);

-            $newHeight = $newHeight;

-        } else {

-            $newWidth = $newWidth;

-            $newHeight = (int) ($newWidth / $source_aspect_ratio);

-        }

-    }

+	if ($ratio == true)

+	{

+		$source_aspect_ratio = $imgWidth / $imgHeight;

+		$thumbnail_aspect_ratio = $newWidth / $newHeight;

+		if ($imgWidth <= $newWidth && $imgHeight <= $newHeight) {

+			$newWidth = $imgWidth;

+			$newHeight = $imgHeight;

+		} elseif ($thumbnail_aspect_ratio > $source_aspect_ratio) {

+			$newWidth = (int) ($newHeight * $source_aspect_ratio);

+			$newHeight = $newHeight;

+		} else {

+			$newWidth = $newWidth;

+			$newHeight = (int) ($newWidth / $source_aspect_ratio);

+		}

+	}

             

-    $imgString = file_get_contents($image);

+	$imgString = file_get_contents($image);

 

-    $imageFromString = imagecreatefromstring($imgString);

-    $tmp = imagecreatetruecolor($newWidth, $newHeight);

-    imagecopyresampled(

-        $tmp,

-        $imageFromString,

-        0,

-        0,

-        0,

-        0,

-        $newWidth,

-        $newHeight,

-        $imgWidth,

-        $imgHeight

-    );

+	$imageFromString = imagecreatefromstring($imgString);

+	$tmp = imagecreatetruecolor($newWidth, $newHeight);

+	imagecopyresampled(

+		$tmp,

+		$imageFromString,

+		0,

+		0,

+		0,

+		0,

+		$newWidth,

+		$newHeight,

+		$imgWidth,

+		$imgHeight

+	);

 

-    switch ($mimeType) {

-        case "jpeg":

-        case "jpg":

-            imagejpeg($tmp, $image, 90);

-            break;

-        case "png":

-            imagepng($tmp, $image, 0);

-            break;

-        case "gif":

-            imagegif($tmp, $image);

-            break;

-        default:

-            throw new \Exception(" Only jpg, jpeg, png and gif files can be resized ");

-            break;

-    }

+	switch ($mimeType) {

+		case "jpeg":

+		case "jpg":

+			imagejpeg($tmp, $image, 90);

+			break;

+		case "png":

+			imagepng($tmp, $image, 0);

+			break;

+		case "gif":

+			imagegif($tmp, $image);

+			break;

+		default:

+			throw new \Exception(" Only jpg, jpeg, png and gif files can be resized ");

+			break;

+	}

  

 }

 

src/utils/func.image-watermark.php

Indentation +82 added lines, -82 removed lines

@@ -11,86 +11,86 @@
 

  function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){

 

-    // Calculate the watermark position

-    switch ($position) {

-        case "center":

-            $marginBottom  = round($imgHeight / 2);

-            $marginRight   = round($imgWidth / 2) - round($watermarkWidth / 2);

-            break;

-

-        case "top-left":

-            $marginBottom  = round($imgHeight - $watermarkHeight);

-            $marginRight   = round($imgWidth - $watermarkWidth);

-            break;

-

-        case "bottom-left":

-            $marginBottom  = 5;

-            $marginRight   = round($imgWidth - $watermarkWidth);

-            break;

-

-        case "top-right":

-            $marginBottom  = round($imgHeight - $watermarkHeight);

-            $marginRight   = 5;

-            break;

-

-        default:

-            $marginBottom  = 2;

-            $marginRight   = 2;

-            break;

-    }

-

-

-    $watermark = imagecreatefrompng($watermark);

-

-    switch ($mimeType) {

-        case "jpeg":

-        case "jpg":

-            $createImage = imagecreatefromjpeg($image);

-            break;

-

-        case "png":

-            $createImage = imagecreatefrompng($image);

-            break;

-

-        case "gif":

-            $createImage = imagecreatefromgif($image);

-            break;

-

-        default:

-            $createImage = imagecreatefromjpeg($image);

-            break;

-    }

-

-    $sx = imagesx($watermark);

-    $sy = imagesy($watermark);

-    imagecopy(

-        $createImage,

-        $watermark,

-        imagesx($createImage) - $sx - $marginRight,

-        imagesy($createImage) - $sy - $marginBottom,

-        0,

-        0,

-        imagesx($watermark),

-        imagesy($watermark)

-    );

-

-

-    switch ($mimeType) {

-        case "jpeg":

-        case "jpg":

-             imagejpeg($createImage, $image);

-            break;

-

-        case "png":

-             imagepng($createImage, $image);

-            break;

-

-        case "gif":

-             imagegif($createImage, $image);

-            break;

-

-        default:

-            throw new \Exception("A watermark can only be applied to: jpeg, jpg, gif, png images ");

-            break;

-    }

+	// Calculate the watermark position

+	switch ($position) {

+		case "center":

+			$marginBottom  = round($imgHeight / 2);

+			$marginRight   = round($imgWidth / 2) - round($watermarkWidth / 2);

+			break;

+

+		case "top-left":

+			$marginBottom  = round($imgHeight - $watermarkHeight);

+			$marginRight   = round($imgWidth - $watermarkWidth);

+			break;

+

+		case "bottom-left":

+			$marginBottom  = 5;

+			$marginRight   = round($imgWidth - $watermarkWidth);

+			break;

+

+		case "top-right":

+			$marginBottom  = round($imgHeight - $watermarkHeight);

+			$marginRight   = 5;

+			break;

+

+		default:

+			$marginBottom  = 2;

+			$marginRight   = 2;

+			break;

+	}

+

+

+	$watermark = imagecreatefrompng($watermark);

+

+	switch ($mimeType) {

+		case "jpeg":

+		case "jpg":

+			$createImage = imagecreatefromjpeg($image);

+			break;

+

+		case "png":

+			$createImage = imagecreatefrompng($image);

+			break;

+

+		case "gif":

+			$createImage = imagecreatefromgif($image);

+			break;

+

+		default:

+			$createImage = imagecreatefromjpeg($image);

+			break;

+	}

+

+	$sx = imagesx($watermark);

+	$sy = imagesy($watermark);

+	imagecopy(

+		$createImage,

+		$watermark,

+		imagesx($createImage) - $sx - $marginRight,

+		imagesy($createImage) - $sy - $marginBottom,

+		0,

+		0,

+		imagesx($watermark),

+		imagesy($watermark)

+	);

+

+

+	switch ($mimeType) {

+		case "jpeg":

+		case "jpg":

+			 imagejpeg($createImage, $image);

+			break;

+

+		case "png":

+			 imagepng($createImage, $image);

+			break;

+

+		case "gif":

+			 imagegif($createImage, $image);

+			break;

+

+		default:

+			throw new \Exception("A watermark can only be applied to: jpeg, jpg, gif, png images ");

+			break;

+	}

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

- function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){

+ function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center") {

 

     // Calculate the watermark position

     switch ($position) {

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

- function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){

+ function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center") {
 

     // Calculate the watermark position

     switch ($position) {