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

     }

 }

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(

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