samayo / bulletproof

src/bulletproof.php

Spacing +15 added lines, -15 removed lines

@@ -114,21 +114,21 @@ 
      * 

      * @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

@@ -152,7 +152,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']];

       }

 

@@ -180,7 +180,7 @@ 
      */

     public function getFullPath()

     {

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

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

     }

 

     /**

@@ -214,7 +214,7 @@ 
      */

     public function getJson()

     {

-      return json_encode (

+      return json_encode(

         array(

           'name'      => $this->name,

           'mime'      => $this->mime,

@@ -234,7 +234,7 @@ 
      */

     public function getMime()

     {

-      if(!$this->mime){

+      if (!$this->mime) {

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

       }

       

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

     {

       if (!$this->name) {

-        $this->name = uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));

+        $this->name = uniqid('', true).'_'.str_shuffle(implode(range('e', 'q')));

       }

 

       return $this->name;

@@ -376,15 +376,15 @@ 
     {

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

 

-      if(!$isDirectoryValid){

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

+      if (!$isDirectoryValid) {

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

         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! directory \'' . $dir . '\' could not be created';

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

         return false;

       }

 

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

       }

 

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

       }

 

@@ -461,7 +461,7 @@ 
     public function moveUploadedFile($tmp_name, $destination)

     {

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

-        $moveUpload = move_uploaded_file($tmp_name, $destination);;

+        $moveUpload = move_uploaded_file($tmp_name, $destination); ;

         if (false !== $moveUpload) {

           return $this;

         } else {

Braces +20 added lines, -40 removed lines

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

@@ -136,8 +135,7 @@ 
      * @param mixed $offset

      * @return string|boolean

      */

-    public function offsetGet($offset)

-    {   

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

       if ($offset == 'error') {

           return $this->error;

@@ -167,8 +165,7 @@ 
      * 

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

       return $this;

     }

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

      * @return string

      */

-    public function getFullPath()

-    {

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

     }

 

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

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

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

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

       return $this;

     }

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

      * @return string

      */

-    public function getJson()

-    {

+    public function getJson() {
       return json_encode (

         array(

           'name'      => $this->name,

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

      * @return null|string

      */

-    public function getMime()

-    {

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

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

       }

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

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

       return $this;

     }

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

      * @return null|string

      */

-    protected function getImageMime($tmp_name)

-    {

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

       if (!$this->mime) {

         return null;

@@ -276,8 +266,7 @@ 
      *

      * @return string|false

      */

-    public function getError()

-    {

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

     }

 

@@ -286,8 +275,7 @@ 
      *

      * @return string

      */

-    public function getName()

-    {

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

         $this->name = uniqid('', true) . '_' . str_shuffle(implode(range('e', 'q')));

       }

@@ -301,8 +289,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);

       }

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

      * @return int

      */

-    public function getWidth()

-    {

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

         return $this->width;

       }

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

      * @return int

      */

-    public function getHeight()

-    {

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

         return $this->height;

       }

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

      * @return string

      */

-    public function getLocation()

-    {

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

         $this->setLocation();

       }

@@ -360,8 +344,7 @@ 
      * @param $dir string the folder name to check

      * @return bool

      */

-    private function isDirectoryValid($dir) 

-    {

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

     }

 

@@ -372,8 +355,7 @@ 
      * @param int $permission chmod permission

      * @return $this

      */

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

-    {

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

 

       if(!$isDirectoryValid){

@@ -397,8 +379,7 @@ 
      * 

      * @return false|Image

      */

-    public function upload()

-    {

+    public function upload() {
       $image = $this;

       $files = $this->_files;

 

@@ -458,8 +439,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

+    public function moveUploadedFile($tmp_name, $destination) {
       if ($image->error === '') {

         $moveUpload = move_uploaded_file($tmp_name, $destination);;

         if (false !== $moveUpload) {