samayo / bulletproof

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":

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);

src/utils/func.image-watermark.php

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) {

src/bulletproof.php

Braces +21 added lines, -41 removed lines

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

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

      */

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

-    {

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

     }

 

@@ -122,8 +121,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)];

         }

@@ -145,8 +143,7 @@ 
      *

      * @return bool|mixed

      */

-    public function offsetGet($offset)

-    {

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

             return $this->error;

         }

@@ -166,8 +163,7 @@ 
      *

      * @return $this

      */

-    public function setName($isNameProvided = null)

-    {

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

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

         }

@@ -182,8 +178,7 @@ 
      *

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

         return $this;

     }

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

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

         return $this;

     }

@@ -210,8 +204,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) {

@@ -232,8 +225,7 @@ 
      *

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

         return $this;

     }

@@ -245,8 +237,7 @@ 
 	 *

 	 * @return $this

 	 */

-	public function setErrorMessages($new_error_messages)

-	{

+	public function setErrorMessages($new_error_messages) {
 		if($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {

 			$this->error_messages = $new_array;

 		};

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

      * @return string

      */

-    public function getName()

-    {

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

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

         }

@@ -272,8 +262,7 @@ 
      *

      * @return string

      */

-    public function getFullPath()

-    {

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

         return $this->fullPath;

     }

@@ -283,8 +272,7 @@ 
      *

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

@@ -293,8 +281,7 @@ 
      *

      * @return int

      */

-    public function getHeight()

-    {

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

             return $this->height;

         }

@@ -308,8 +295,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

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

             return $this->width;

         }

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

      * @return string

      */

-    public function getLocation()

-    {

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

             $this->setLocation(); 

         }

@@ -337,8 +322,7 @@ 
      *

      * @return string

      */

-    public function getJson()

-    {

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

     }

 

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

      * @return string

      */

-    public function getMime()

-    {

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

     }

 

@@ -357,7 +340,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {
         return $this->error != "" ? $this->error : false;

     }

 

@@ -366,8 +349,7 @@ 
      *

      * @param $e int error constant

      */

-    protected function uploadErrors($e)

-    {

+    protected function uploadErrors($e) {
         $errors = $this->error_messages['upload'];

         return $errors[$e];

     }

@@ -378,8 +360,7 @@ 
      *

      * @return $this|bool

      */

-    public function upload()

-    {

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

         $image = $this; 

         $files = $this->_files;

@@ -462,8 +443,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

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

     }

 }

Spacing +14 added lines, -14 removed lines

@@ -134,18 +134,18 @@ 
      * @param mixed $offset

      * @param mixed $value

      */

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

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

 

     /**

      * @param mixed $offset

      * @return null

      */

-    public function offsetExists($offset){}

+    public function offsetExists($offset) {}

 

     /**

      * @param mixed $offset

      */

-    public function offsetUnset($offset){}

+    public function offsetUnset($offset) {}

 

     /**

      * Gets array value \ArrayAccess

@@ -222,7 +222,7 @@ 
     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 = sprintf($this->error_messages['location'], $dir);

                 return;

@@ -256,7 +256,7 @@ 
 	 */

 	public function setErrorMessages($new_error_messages)

 	{

-		if($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {

+		if ($new_array = array_replace_recursive($this->error_messages, $new_error_messages)) {

 			$this->error_messages = $new_array;

 		};

 		return $this;

@@ -270,7 +270,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;

@@ -283,7 +283,7 @@ 
      */

     public function getFullPath()

     {

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

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

         return $this->fullPath;

     }

 

@@ -334,7 +334,7 @@ 
      */

     public function getLocation()

     {

-        if(!$this->location){

+        if (!$this->location) {

             $this->setLocation(); 

         }

 

@@ -366,7 +366,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {

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

     }

 

@@ -394,7 +394,7 @@ 
         $files = $this->_files;

 

         /* check if php_exif is enabled */

-        if(!function_exists('exif_imagetype')){

+        if (!function_exists('exif_imagetype')) {

             $image->error = "Function 'exif_imagetype' Not found. Please enable \"php_exif\" in your PHP.ini";

             return null;

         }

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

 

         /* check for common upload errors */

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

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

             return null;

         }

 

@@ -439,13 +439,13 @@ 
             return null;

         }

 

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

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

             $image->error = $this->error_messages['too_small'];

             return null;

         }

  

         /* 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(

@@ -465,7 +465,7 @@ 
             }

         }

 

-        $image->error =  $this->error_messages['unknown'];

+        $image->error = $this->error_messages['unknown'];

         return false;

     }