samayo / bulletproof

src/bulletproof.php

Doc Comments +3 added lines, -3 removed lines

@@ -138,7 +138,7 @@ 
      *

      * @param mixed $offset

      *

-     * @return bool

+     * @return string|boolean

      */

     public function offsetGet($offset)

     {   

@@ -280,7 +280,7 @@ 
     /**

      * Returns error string or false if no errors occurred

      *

-     * @return string|bool

+     * @return string|false

      */

     public function getError()

     {

@@ -475,7 +475,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 +9 added lines, -9 removed lines

@@ -195,7 +195,7 @@ 
      */

     public function getFullPath()

     {

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

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

         return $this->fullPath;

     }

 

@@ -206,7 +206,7 @@ 
      */

     public function getSize()

     {

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

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

     }

 

     /**

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

         }

 

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

         }

 

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

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

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

         }