samayo / bulletproof

src/bulletproof.php

Doc Comments +3 added lines, -3 removed lines

@@ -152,7 +152,7 @@ 
      *

      * @param mixed $offset

      *

-     * @return bool|mixed

+     * @return string|boolean

      */

     public function offsetGet($offset)

     {

@@ -364,7 +364,7 @@ 
     /**

      * Returns error string or false if no errors occurred

      *

-     * @return string|bool

+     * @return string|false

      */

     public function getError(){

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

@@ -473,7 +473,7 @@ 
      * Final upload method to be called, isolated for testing purposes

      *

      * @param $tmp_name int the temporary location of the image file

-     * @param $destination int upload destination

+     * @param string $destination int upload destination

      *

      * @return bool

      */

Spacing +14 added lines, -14 removed lines

@@ -134,18 +134,18 @@ 
      * @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(); 

         }

 

@@ -366,7 +366,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

+    public function getError() {

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

     }

 

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

         }

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

         }

 

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

@@ -465,7 +465,7 @@ 
             }

         }

 

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

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

         return false;

     }