samayo / bulletproof

src/bulletproof.php

Spacing +13 added lines, -13 removed lines

@@ -110,19 +110,19 @@ 
      * @param mixed $value

      * @return null

      */

-    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

      * @return null

      */

-    public function offsetUnset($offset){}

+    public function offsetUnset($offset) {}

 

     /**

      * Gets array value \ArrayAccess

@@ -146,7 +146,7 @@ 
         $this->_files = $this->_files[$offset];

 

         // check for common upload errors

-        if(isset($this->_files['error'])){

+        if (isset($this->_files['error'])) {

             $this->error = $this->commonUploadErrors[$this->_files['error']];

         }

 

@@ -174,7 +174,7 @@ 
      */

     public function getFullPath()

     {

-       return $this->fullPath = $this->getLocation() . '/' . $this->getName() . '.' . $this->getMime();

+       return $this->fullPath = $this->getLocation().'/'.$this->getName().'.'.$this->getMime();

     }

 

     /**

@@ -209,7 +209,7 @@ 
     public function getJson()

     {

         /* gather image info for json storage */

-        return json_encode (

+        return json_encode(

             array(

                 'name'      => $this->name,

                 'mime'      => $this->mime,

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

@@ -373,15 +373,15 @@ 
     {

         $isDirectoryValid = $this->isDirectoryValid($dir); 

 

-        if(!$isDirectoryValid){

-            $this->error = 'Can not create a folder \'' . $dir . '\', please check your dir permission issues';

+        if (!$isDirectoryValid) {

+            $this->error = 'Can not create a folder \''.$dir.'\', please check your dir permission issues';

             return false;

         }

       

-        $create = !is_dir($dir) ? @mkdir('' . $dir, (int) $permission, true) : true; 

+        $create = !is_dir($dir) ? @mkdir(''.$dir, (int) $permission, true) : true; 

 

         if (!$create) {

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

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

             return false;

         }

 

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

         }

 

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

         }

 

Braces +20 added lines, -40 removed lines

@@ -94,8 +94,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';

@@ -131,8 +130,7 @@ 
      *

      * @return string|boolean

      */

-    public function offsetGet($offset)

-    {   

+    public function offsetGet($offset) {
         // return error if requested

         if ($offset == 'error') {

             return $this->error;

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

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

         return $this;

     }

@@ -172,8 +169,7 @@ 
      *

      * @return string

      */

-    public function getFullPath()

-    {

+    public function getFullPath() {
        return $this->fullPath = $this->getLocation() . '/' . $this->getName() . '.' . $this->getMime();

     }

 

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

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

@@ -195,8 +190,7 @@ 
      *

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

         return $this;

     }

@@ -206,8 +200,7 @@ 
      *

      * @return string

      */

-    public function getJson()

-    {

+    public function getJson() {
         /* gather image info for json storage */

         return json_encode (

             array(

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

      * @return null|string

      */

-    public function getMime()

-    {

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

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

         }

@@ -242,8 +234,7 @@ 
      *

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

         return $this;

     }

@@ -255,8 +246,7 @@ 
      *

      * @return null|string

      */

-    protected function getImageMime($tmp_name)

-    {

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

 

         if (!$mime) {

@@ -271,8 +261,7 @@ 
      *

      * @return string|false

      */

-    public function getError()

-    {

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

     }

 

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

      * @return string

      */

-    public function getName()

-    {

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

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

         }

@@ -296,8 +284,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);

         }

@@ -310,8 +297,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

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

             return $this->width;

         }

@@ -325,8 +311,7 @@ 
      *

      * @return int

      */

-    public function getHeight()

-    {

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

             return $this->height;

         }

@@ -340,8 +325,7 @@ 
      *

      * @return string

      */

-    public function getLocation()

-    {

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

             $this->setLocation();

         }

@@ -356,8 +340,7 @@ 
      * 

      * @return bool

      */

-    private function isDirectoryValid($dir) 

-    {

+    private function isDirectoryValid($dir) {
        return !file_exists($dir) && !is_dir($dir) || is_writable($dir); 

     }

 

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

      * @return $this

      */

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

-    {

+    public function setLocation($dir = 'bulletproof', $permission = 0666) {
         $isDirectoryValid = $this->isDirectoryValid($dir); 

 

         if(!$isDirectoryValid){

@@ -393,8 +375,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;

@@ -463,8 +444,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

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

     }

 }
\ No newline at end of file