dimaslanjaka / universal-framework

src/bulletproof/src/utils/func.image-resize.php

Spacing +19 added lines, -19 removed lines

@@ -65,13 +65,13 @@ 
         if ($thumbnail_aspect_ratio < $source_aspect_ratio) {
             $src_h = $imgHeight;
             $src_w = $imgHeight * $thumbnail_aspect_ratio;
-            $src_x = (int) (($imgWidth - $src_w)/2);
+            $src_x = (int) (($imgWidth - $src_w) / 2);
             $src_y = 0;
         } else {
             $src_w = $imgWidth;
             $src_h = (int) ($imgWidth / $thumbnail_aspect_ratio);
             $src_x = 0;
-            $src_y = (int) (($imgHeight - $src_h)/2);
+            $src_y = (int) (($imgHeight - $src_h) / 2);
         }
 
         // Checks whether image upsizing is enabled
@@ -86,26 +86,26 @@ 
                 if ($newHeight > $newHeightOrig) {
                     $newHeight = $newHeightOrig;
                     $src_h = $newHeight;
-                    $src_y = (int) (($imgHeight - $src_h)/2);
+                    $src_y = (int) (($imgHeight - $src_h) / 2);
                 }
 
-                $src_x=0;
+                $src_x = 0;
                 $src_w = $imgWidth;
             }
 
             // If the given height is larger then the image height, then resize it.
             if ($newHeightOrig > $imgHeight) {
                 $newHeight = $imgHeight;
-                $src_y=0;
+                $src_y = 0;
                 $src_h = $imgHeight;
-                $src_w = (int) ($src_h * ( $newWidth / $newHeight ));
-                $src_x = (int) (($imgWidth - $src_w)/2);
+                $src_w = (int) ($src_h * ($newWidth / $newHeight));
+                $src_x = (int) (($imgWidth - $src_w) / 2);
             }
         }
     } else {
 
         // First, calculate the height.
-        $height = (int) ($newWidth / $imgWidth * $imgHeight);  //  75
+        $height = (int) ($newWidth / $imgWidth * $imgHeight); //  75
 
         // If the height is too large, set it to the maximum height and calculate the width.
         if ($height > $newHeight) {
@@ -169,7 +169,7 @@ 
     );
 
     if ($destination !== false) {  // checks if was destination provided
-        if(substr( $destination, -1 ) == '/' ) { // check whether prowided destination was folder or file.
+        if (substr($destination, -1) == '/') { // check whether prowided destination was folder or file.
             $create = !is_dir($destination) ? @mkdir($destination, $permission, true) : true; // if it was folder, it will crtete it if needed
             if ($create) {
                 $path_parts = pathinfo($image);
@@ -184,7 +184,7 @@ 
     }
 
     $path_parts = pathinfo($destination);
-    $create = !is_dir($path_parts['dirname'].'/') ? @mkdir($path_parts['dirname'].'/', $permission, true) : true;
+    $create = !is_dir($path_parts['dirname'] . '/') ? @mkdir($path_parts['dirname'] . '/', $permission, true) : true;
     if (!$create) {
         return false; // TODO: throw error/exception
     }
@@ -193,35 +193,35 @@ 
         case "jpeg":
         case "jpg":
             $q = 90; // function's default value - if everything else fails, this is used.
-            if( false !== $image ) {
-                if ((!empty($quality['jpg']['fallback'])) AND ( (int) $quality['jpg']['fallback'] ) AND ( $quality['jpg']['fallback'] > 0 ) AND ( $quality['jpg']['fallback'] <=100 ) ) {
+            if (false !== $image) {
+                if ((!empty($quality['jpg']['fallback'])) AND ((int) $quality['jpg']['fallback']) AND ($quality['jpg']['fallback'] > 0) AND ($quality['jpg']['fallback'] <= 100)) {
                     $q = $quality['jpg']['fallback'];
                 }
 
-                if ((!empty($quality['jpg']['orig'])) AND true ===$quality['jpg']['orig'] ){
-                    if (extension_loaded('imagick')){
+                if ((!empty($quality['jpg']['orig'])) AND true === $quality['jpg']['orig']) {
+                    if (extension_loaded('imagick')) {
                         $im = new \Imagick($image);
                         $q = $im->getImageCompressionQuality();
                     }
                 }
 
-                if((!empty($quality['jpg']['max'])) AND $quality['jpg']['max'] < $q ){
+                if ((!empty($quality['jpg']['max'])) AND $quality['jpg']['max'] < $q) {
                     $q = $quality['jpg']['max'];
                 }
 
-                if((!empty($quality['jpg']['min'])) AND $quality['jpg']['min'] > $q ){
+                if ((!empty($quality['jpg']['min'])) AND $quality['jpg']['min'] > $q) {
                     $q = $quality['jpg']['min'];
                 }
             }
-            return imagejpeg($tmp, $destination, $q );
+            return imagejpeg($tmp, $destination, $q);
             break;
         case "png":
-            if ((!empty($quality['png'])) AND ( (int) $quality['png'] ) AND ( $quality['png'] >= -1 ) AND ( $quality['png'] <=9 ) ) {
+            if ((!empty($quality['png'])) AND ((int) $quality['png']) AND ($quality['png'] >= -1) AND ($quality['png'] <= 9)) {
                 $q = $quality['png'];
             } else {
                 $q = -1; // -1 is zlib's default value which is currently ( 11/2018 ) equal to 6
             }
-            return imagepng($tmp, $destination, $q );
+            return imagepng($tmp, $destination, $q);
             break;
         case "gif":
             return imagegif($tmp, $destination);

src/bulletproof/test/uploadTest.php

Indentation +3 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
 
     // check full path of image uploaded
 
-   public function testFullpath(){
+    public function testFullpath(){
         $this->bulletproof->setLocation('uploads');
         $this->bulletproof->setName('2012');
         $this->bulletproof->setMime(['jpeg']);
@@ -92,7 +92,7 @@ 
 
  
     // check json return value of image
-     public function testJsonOutput(){
+      public function testJsonOutput(){
         $upload = $this->bulletproof->setName('we_belive_in_json')->upload();
         $this->assertSame($upload->getJson(), 
             '{"name":"we_belive_in_json","mime":"jpeg","height":345,"width":384,"size":17438,"storage":"uploads","path":"uploads\/we_belive_in_json.jpeg"}');
@@ -119,7 +119,7 @@ 
     public function testImageSizeFailWithMsg () {
       $this->bulletproof->setSize(888, 9999);
       $upload = $this->bulletproof->upload();
-       $this->assertEquals($this->bulletproof->getError(), 'Image size should be minumum 888 bytes (0 kb), upto maximum 9999 bytes (9 kb)');
+        $this->assertEquals($this->bulletproof->getError(), 'Image size should be minumum 888 bytes (0 kb), upto maximum 9999 bytes (9 kb)');
     }
 
     // check invalid dimension fails with msg

Spacing +11 added lines, -11 removed lines

@@ -28,21 +28,21 @@ 
     }
 
     // check if the name provide in the html input is read by bulletproof
-    public function testImageNameIsSame () {
+    public function testImageNameIsSame() {
       $this->bulletproof->setName('samayo'); 
       $this->assertEquals($this->bulletproof->getName(), 'samayo');
     }
 
 
     // test image accepts certain mime types
-    public function testMimeTypes () {
+    public function testMimeTypes() {
       $this->bulletproof->setMime(['jpeg']);
       $upload = $this->bulletproof->upload();
       $this->assertEquals($upload->getMime(), 'jpeg');
     }
 
     // check dimensions params
-    public function testDimensions () {
+    public function testDimensions() {
       // give it out of range (minimum dimentions than the class requires)
       $this->bulletproof->setDimension(1, 'b');
       $upload = $this->bulletproof->upload();
@@ -51,7 +51,7 @@ 
 
 
     // check size of the image is correct
-    public function testSize () {
+    public function testSize() {
       $this->bulletproof->upload(); 
       $this->assertEquals($this->bulletproof->getSize(), 17438); // 17438 is size of the monkey.jpg
     }
@@ -73,7 +73,7 @@ 
     }
 
     // check if setting image storage is correct
-    public function testLocation () {
+    public function testLocation() {
       $this->bulletproof->setLocation('uploads');
       $this->assertEquals($this->bulletproof->getStorage(), 'uploads');
     }
@@ -81,7 +81,7 @@ 
 
     // check full path of image uploaded
 
-   public function testFullpath(){
+   public function testFullpath() {
         $this->bulletproof->setLocation('uploads');
         $this->bulletproof->setName('2012');
         $this->bulletproof->setMime(['jpeg']);
@@ -92,7 +92,7 @@ 
 
  
     // check json return value of image
-     public function testJsonOutput(){
+     public function testJsonOutput() {
         $upload = $this->bulletproof->setName('we_belive_in_json')->upload();
         $this->assertSame($upload->getJson(), 
             '{"name":"we_belive_in_json","mime":"jpeg","height":345,"width":384,"size":17438,"storage":"uploads","path":"uploads\/we_belive_in_json.jpeg"}');
@@ -101,7 +101,7 @@ 
 
     // check invalid mimetype fails
 
-    public function testMimeTypeFail () {
+    public function testMimeTypeFail() {
       $this->bulletproof->setMime(['gif']);
       $upload = $this->bulletproof->upload();
       $this->assertFalse($upload);
@@ -109,21 +109,21 @@ 
 
     // check invalid mimetype fails with msg
 
-    public function testMimeTypeFailWithMsg () {
+    public function testMimeTypeFailWithMsg() {
       $this->bulletproof->setMime(['gif']);
       $upload = $this->bulletproof->upload();
       $this->assertEquals($this->bulletproof->getError(), 'Invalid File! Only (gif) image types are allowed');
     }
 
     // check invalid size with msg
-    public function testImageSizeFailWithMsg () {
+    public function testImageSizeFailWithMsg() {
       $this->bulletproof->setSize(888, 9999);
       $upload = $this->bulletproof->upload();
        $this->assertEquals($this->bulletproof->getError(), 'Image size should be minumum 888 bytes (0 kb), upto maximum 9999 bytes (9 kb)');
     }
 
     // check invalid dimension fails with msg
-public function testImageDimensionFailWithMsg () {
+public function testImageDimensionFailWithMsg() {
   $this->bulletproof->setDimension(42, 43);
   $this->bulletproof->upload();
     $this->assertEquals($this->bulletproof->getError(), 'Image height/width should be less than 43/42 pixels');

src/bulletproof/test/BulletproofTest.php

Indentation +6 added lines, -6 removed lines

@@ -4,10 +4,10 @@ 
 
 class BulletproofTest extends \Bulletproof\Image {
 
-	/**
-     * Return true at this point since we can't upload files
-     * during test (or can we? I don't know!)
-     */
+  /**
+   * Return true at this point since we can't upload files
+   * during test (or can we? I don't know!)
+   */
     public function isSaved($tmp, $desination)
     {
         return true;
@@ -17,7 +17,7 @@ 
      * Prevent class from making new folder
      */
     public function setLocation($dir = "bulletproof", $optionalPermision = 0666){
-    	$this->location = $dir;
-    	return $this; 
+      $this->location = $dir;
+      return $this; 
     }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     /**
      * Prevent class from making new folder
      */
-    public function setLocation($dir = "bulletproof", $optionalPermision = 0666){
+    public function setLocation($dir = "bulletproof", $optionalPermision = 0666) {
     	$this->location = $dir;
     	return $this; 
     }

src/shim/func.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
     // you want to allow, and if so:
     header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
     header('Access-Control-Allow-Credentials: true');
-    header('Access-Control-Max-Age: 86400');    // cache for 1 day
+    header('Access-Control-Max-Age: 86400'); // cache for 1 day
   }
 
   // Access-Control headers are received during OPTIONS requests
@@ -89,8 +89,8 @@ 
     }
   }
   if (is_numeric($val)) {
-    $int = (int)$val;
-    $float = (float)$val;
+    $int = (int) $val;
+    $float = (float) $val;
 
     $val = ($int == $float) ? $int : $float;
     return $val;
@@ -177,7 +177,7 @@ 
  */
 function get_includes()
 {
-  $included = array_values(array_filter(array_map(function ($arr) {
+  $included = array_values(array_filter(array_map(function($arr) {
     if (is_string($arr)) {
       if (strpos($arr, 'vendor')) {
         return '';

Braces +6 added lines, -2 removed lines

@@ -15,7 +15,9 @@ 
  */
 function cors()
 {
-  if (!headers_sent()) return;
+  if (!headers_sent()) {
+    return;
+  }
 
   // Allow from any origin
   if (isset($_SERVER['HTTP_ORIGIN'])) {
@@ -151,7 +153,9 @@ 
   if (!file_exists(dirname($file))) {
     mkdir(dirname($file));
   }
-  if (file_exists($file)) delete($file);
+  if (file_exists($file)) {
+    delete($file);
+  }
   file_put_contents($file, $content, ($append ? FILE_APPEND : 0));
 }
 

src/shim/post.php

Braces +6 added lines, -2 removed lines

@@ -19,9 +19,13 @@
       $thePost = $_POST[$name];
       if ($flag != POST_DEFAULT_FLAG) {
         if ($flag == POST_NOT_NULL) {
-          if ($thePost != null) return $thePost;
+          if ($thePost != null) {
+            return $thePost;
+          }
         } else if ($flag == POST_NOT_EMPTY) {
-          if (!empty($thePost)) return $thePost;
+          if (!empty($thePost)) {
+            return $thePost;
+          }
         }
       } else {
         return $thePost;

src/shim/mysql-func.php

Braces +6 added lines, -2 removed lines

@@ -9,7 +9,11 @@
 function current_timestamp($date = null)
 {
   $timestamp = $date;
-  if (is_string($date)) $timestamp = strtotime($date);
-  if (is_null($date)) $timestamp = time();
+  if (is_string($date)) {
+    $timestamp = strtotime($date);
+  }
+  if (is_null($date)) {
+    $timestamp = time();
+  }
   return date("Y-m-d H:i:s", $timestamp);
 }