samayo / bulletproof

src/bulletproof.php

Spacing +12 added lines, -12 removed lines

@@ -167,14 +167,14 @@ 
             return $this->error;

         }

 

-        if(!isset($this->_files[$offset])){

-            return ;

+        if (!isset($this->_files[$offset])) {

+            return;

         }

 

         /* check for common upload errors */

         if ($this->_files[$offset]['error'] == 2) {

             $this->error = "Image is larger than specified by the browser";

-            return ;

+            return;

         }

 

         if ($this->error || $this->error = $this->commonUploadErrors($this->_files[$offset]['error'])) {

@@ -244,16 +244,16 @@ 
     {

 

         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 = 'Error! Folder ' . $dir . ' could not be created';

+                $this->error = 'Error! Folder '.$dir.' could not be created';

                 return false;

             }

         }

         

         /* check if we can create a file in the directory */

         if (!is_writable($dir)) {

-            $this->error =  "The images directory \"" . $dir . "\" is not writable!";

+            $this->error = "The images directory \"".$dir."\" is not writable!";

             return false;

         }

 

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

@@ -296,7 +296,7 @@ 
      */

     public function getFullPath()

     {

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

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

         return $this->fullPath;

     }

 

@@ -307,7 +307,7 @@ 
      */

     public function getSize()

     {

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

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

     }

 

     /**

@@ -433,7 +433,7 @@ 
         if ($files['size'] < $minSize || $files['size'] > $maxSize) {

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

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

-            $image->error = "Image size should be at least " . $min . " KB, and no more than " . $max . " KB";

+            $image->error = "Image size should be at least ".$min." KB, and no more than ".$max." KB";

             return null;

         }

 

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

 

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

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

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

             return false;

         }

 

@@ -451,7 +451,7 @@ 
         }

 

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

Braces +23 added lines, -46 removed lines

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

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

      */

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

-    {

+    public function __construct(array $_files = array()) {
         /* check if php_exif is enabled */

         if (!function_exists('exif_imagetype')) {

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

@@ -120,8 +119,7 @@ 
      *

      * @return null|string

      */

-    protected function getImageMime($tmp_name)

-    {

+    protected function getImageMime($tmp_name) {
         $mime = @$this->imageMimes[exif_imagetype($tmp_name)];

 

         if (!$mime) {

@@ -135,23 +133,20 @@ 
      * @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) {
     }

 

     /**

@@ -161,8 +156,7 @@ 
      *

      * @return bool

      */

-    public function offsetGet($offset)

-    {

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

             return $this->error;

         }

@@ -196,8 +190,7 @@ 
      * @param null $isNameProvided

      * @return $this

      */

-    public function setName($isNameProvided = null)

-    {

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

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

         }

@@ -212,8 +205,7 @@ 
      *

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

         return $this;

     }

@@ -226,8 +218,7 @@ 
      *

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

         return $this;

     }

@@ -240,8 +231,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);

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

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

         return $this;

     }

@@ -280,8 +269,7 @@ 
      *

      * @return string

      */

-    public function getName()

-    {

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

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

         }

@@ -294,8 +282,7 @@ 
      *

      * @return string

      */

-    public function getFullPath()

-    {

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

         return $this->fullPath;

     }

@@ -305,8 +292,7 @@ 
      *

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

@@ -315,8 +301,7 @@ 
      *

      * @return int

      */

-    public function getHeight()

-    {

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

             return $this->height;

         }

@@ -330,8 +315,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

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

             return $this->width;

         }

@@ -345,8 +329,7 @@ 
      *

      * @return string

      */

-    public function getLocation()

-    {

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

             $this->setLocation();

         }

@@ -359,8 +342,7 @@ 
      *

      * @return string

      */

-    public function getJson()

-    {

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

     }

 

@@ -369,8 +351,7 @@ 
      *

      * @return string

      */

-    public function getMime()

-    {

+    public function getMime() {
         if (!$this->mime) {

             return $this->getImageMime($this->_files['tmp_name']);

         }

@@ -382,8 +363,7 @@ 
      *

      * @return string|bool

      */

-    public function getError()

-    {

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

     }

 

@@ -394,8 +374,7 @@ 
      *

      * @return string

      */

-    protected function commonUploadErrors($errors)

-    {

+    protected function commonUploadErrors($errors) {
         return $this->common_upload_errors[$errors];

     }

 

@@ -403,8 +382,7 @@ 
      * This methods validates and uploads the image

      * @return false|Image

      */

-    public function upload()

-    {

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

         $image = $this;

         $files = $this->_files;

@@ -483,8 +461,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

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

     }

 }