samayo / bulletproof

src/bulletproof.php

Doc Comments +2 added lines, -4 removed lines

@@ -154,8 +154,6 @@ 
     /**

      * Renames image

      *

-     * @param null $isNameGiven if null, image will be auto-generated

-     *

      * @return $this

      */

     public function setName($isNameProvided = null)

@@ -332,7 +330,7 @@ 
     /**

      * Returns error string or false if no errors occurred

      *

-     * @return string|bool

+     * @return integer

      */

     public function getError(){

         return $this->error;

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

      */

Braces +20 added lines, -39 removed lines

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

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

      */

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

-    {

+    public function __construct(array $_files = []) {
         $this->_files = $_files;

     }

 

@@ -114,8 +113,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)];

         }

@@ -137,8 +135,7 @@ 
      *

      * @return bool|mixed

      */

-    public function offsetGet($offset)

-    {

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

             return $this->error;

         }

@@ -158,8 +155,7 @@ 
      *

      * @return $this

      */

-    public function setName($isNameProvided = null)

-    {

+    public function setName($isNameProvided = null) {
         if ($isNameProvided) {

             $this->name = filter_var($isNameProvided, FILTER_SANITIZE_STRING);

         }

@@ -174,8 +170,7 @@ 
      *

      * @return $this

      */

-    public function setMime(array $fileTypes)

-    {

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

         return $this;

     }

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

      * @return $this

      */

-    public function setSize($min, $max)

-    {

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

         return $this;

     }

@@ -202,8 +196,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) {

@@ -224,8 +217,7 @@ 
      *

      * @return $this

      */

-    public function setDimension($maxWidth, $maxHeight)

-    {

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

         return $this;

     }

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

      * @return string

      */

-    public function getName()

-    {

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

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

         }

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

      * @return string

      */

-    public function getFullPath()

-    {

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

         return $this->fullPath;

     }

@@ -260,8 +250,7 @@ 
      *

      * @return int

      */

-    public function getSize()

-    {

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

     }

 

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

      * @return int

      */

-    public function getHeight()

-    {

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

             return $this->height;

         }

@@ -285,8 +273,7 @@ 
      *

      * @return int

      */

-    public function getWidth()

-    {

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

             return $this->width;

         }

@@ -300,8 +287,7 @@ 
      *

      * @return string

      */

-    public function getLocation()

-    {

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

             $this->setLocation(); 

         }

@@ -314,8 +300,7 @@ 
      *

      * @return string

      */

-    public function getJson()

-    {

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

     }

 

@@ -324,8 +309,7 @@ 
      *

      * @return string

      */

-    public function getMime()

-    {

+    public function getMime() {
         return $this->mime;

     }

 

@@ -334,7 +318,7 @@ 
      *

      * @return string|bool

      */

-    public function getError(){

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

     }

 

@@ -343,8 +327,7 @@ 
      *

      * @param $e int error constant

      */

-    protected function uploadErrors($e)

-    {

+    protected function uploadErrors($e) {
         $errors = array(

             UPLOAD_ERR_OK           => 0,

             UPLOAD_ERR_INI_SIZE     => Image::IMAGE_ERR_INI_SIZE,

@@ -364,8 +347,7 @@ 
      *

      * @return $this|bool

      */

-    public function upload()

-    {

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

         $image = $this; 

         $files = $this->_files;

@@ -448,8 +430,7 @@ 
      *

      * @return bool

      */

-    public function moveUploadedFile($tmp_name, $destination)

-    {

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

     }

 }

src/utils/func.image-crop.php

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

- function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight){

+ function crop($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight) {
 

     switch ($mimeType) {

         case "jpg":

src/utils/func.image-resize.php

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

-function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE){           

+function resize($image, $mimeType, $imgWidth, $imgHeight, $newWidth, $newHeight, $ratio = FALSE, $upsize = TRUE) {
     

     // First, calculate the height.

     $height = intval($newWidth / $imgWidth * $imgHeight);

src/utils/func.image-watermark.php

Braces +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */

 namespace Bulletproof;

 

- function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center"){

+ function watermark($image, $mimeType, $imgWidth, $imgHeight, $watermark, $watermarkHeight, $watermarkWidth, $position = "center") {
 

     // Calculate the watermark position

     switch ($position) {