samayo / bulletproof

src/bulletproof.php

Spacing +16 added lines, -16 removed lines

@@ -127,25 +127,25 @@ 
         if (isset($this->imageMimes[exif_imagetype($tmp_name)])) {

             return $this->imageMimes [exif_imagetype($tmp_name)];

         }

-        return ;

+        return;

     }

 

     /**

      * @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(); 

         }

 

@@ -358,7 +358,7 @@ 
      */

     public function getMime()

     {

-        if(!$this->mime){

+        if (!$this->mime) {

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

         }

         return $this->mime;

@@ -369,7 +369,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {

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

     }

 

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

         }

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

         }

 

@@ -442,13 +442,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(

@@ -468,7 +468,7 @@ 
             }

         }

 

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

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

         return false;

     }

 

Braces +21 added lines, -41 removed lines

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

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

      */

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

-    {

+    public function __construct(array $_files = array()) {
         $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)];

         }

@@ -154,8 +152,7 @@ 
      *

      * @return bool|mixed

      */

-    public function offsetGet($offset)

-    {

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

             return $this->error;

         }

@@ -175,8 +172,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);

         }

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

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

         return $this;

     }

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

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

         return $this;

     }

@@ -219,8 +213,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) {

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

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

         return $this;

     }

@@ -254,8 +246,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;

 		};

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

      * @return string

      */

-    public function getName()

-    {

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

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

         }

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

      * @return string

      */

-    public function getFullPath()

-    {

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

         return $this->fullPath;

     }

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

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

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

      * @return int

      */

-    public function getHeight()

-    {

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

             return $this->height;

         }

@@ -317,8 +304,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

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

             return $this->width;

         }

@@ -332,8 +318,7 @@ 
      *

      * @return string

      */

-    public function getLocation()

-    {

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

             $this->setLocation(); 

         }

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

      * @return string

      */

-    public function getJson()

-    {

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

     }

 

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

      * @return string

      */

-    public function getMime()

-    {

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

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

         }

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

      * @return string|bool

      */

-    public function getError(){

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

     }

 

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

      * @param $e int error constant

      */

-    protected function uploadErrors($e)

-    {

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

         return $errors[$e];

     }

@@ -390,8 +372,7 @@ 
      * @return bool|Image|null

      * @throws ImageUploaderException

      */

-    public function upload()

-    {

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

         $image = $this;

         $files = $this->_files;

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

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

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

     }

 }