HexMakina / kadro

Controllers/Abilities/__DEL__PictureManager.class.php

Indentation +47 added lines, -47 removed lines

@@ -16,8 +16,8 @@ 
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			return [];
+    if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+      return [];
 
     $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
 
@@ -75,11 +75,11 @@ 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+    if(file_exists($filepath))
       throw new \Exception($this->get_type()." new path '$filepath' already exists");
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+    if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
+      throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
   }
@@ -95,64 +95,64 @@ 
   }
 
   public function make_thumbnail($filepath)
-	{
+  {
     global $settings;
 
-		$cover_iri = null;
-
-		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
-		{
-			case 'image/jpeg':
-			case 'image/pjpeg':
-				$cover_iri = imagecreatefromjpeg($filepath);
-			break;
+    $cover_iri = null;
 
-			case 'image/png':
-				$cover_iri = imagecreatefrompng($filepath);
-			break;
-
-			case 'image/gif':
-				$cover_iri = imagecreatefromgif($filepath);
-			break;
-		}
+    $mime_type = mime_content_type($filepath);
+    switch($mime_type)
+    {
+      case 'image/jpeg':
+      case 'image/pjpeg':
+        $cover_iri = imagecreatefromjpeg($filepath);
+      break;
+
+      case 'image/png':
+        $cover_iri = imagecreatefrompng($filepath);
+      break;
+
+      case 'image/gif':
+        $cover_iri = imagecreatefromgif($filepath);
+      break;
+    }
 
-		if(!is_null($cover_iri))
-		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+    if(!is_null($cover_iri))
+    {
+      $width = imagesx( $cover_iri );
+      $height = imagesy( $cover_iri );
 
-			// calculate thumbnail size
+      // calculate thumbnail size
       
-			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+      $new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
+      $new_height = floor( $height * ( $new_width / $width ) );
 
-			// create a new temporary image
-			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
+      // create a new temporary image
+      $thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
-			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+      // copy and resize old image into new image
+      imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
 
-			// save thumbnail into a file
+      // save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
-		}
-	}
+    }
+  }
 
   public function remove_all()
   {
     $filenames = $this->filenames();
 
     foreach($filenames as $filename)
-				$this->remove($filename);
+        $this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+    if(file_exists($directory) === true)
     {
       if(is_dir($directory) === false)
         throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
-  			throw new \Exception("rmdir($directory) failed like a bitch");
+        if(rmdir($directory) === false)
+        throw new \Exception("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
@@ -169,7 +169,7 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+      if(!file_exists($path))
         $error = 'file does not exist';
       elseif(unlink($path)===false)
         $error = 'unlink() failed';
@@ -223,16 +223,16 @@ 
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
 
-		$pictures = $pi_manager->filenames();
+    $pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
     if(count($pictures)===0)
       return $settings[$item_model_type][$picture_type]['generic_picture'];
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+    if($settings[$item_model_type][$picture_type]['cycle_on_load'])
+      $filename = $pictures[array_rand($pictures, 1)];
+    else
+      $filename = array_shift($pictures);
 
     return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }

Spacing +45 added lines, -45 removed lines

@@ -11,35 +11,35 @@ 
 {
   use FileManager;
   
-  public function filenames($replace_by_thumbs_if_exists=false) : array
+  public function filenames($replace_by_thumbs_if_exists = false) : array
   {
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
+		if (!file_exists($picture_directory) && mkdir($picture_directory) === false)
 			return [];
 
-    $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
+    $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/'); // ID_SEQUENCENUMBER.ext
 
     sort($filenames);
     return $filenames;
   }
 
-  public function filepathes($replace_by_thumbs_if_exists=false)
+  public function filepathes($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $filepathes[] = $this->locate_thumbnail($filename);
 
     return $filepathes;
   }
 
-  public function file_uris($replace_by_thumbs_if_exists=false)
+  public function file_uris($replace_by_thumbs_if_exists = false)
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
       $uris[] = $this->locate_file($filename);
 
     dd($uris);
@@ -55,7 +55,7 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
+    if (array_key_exists($mime, $picture_mime_to_gd_create_function))
       return true;
     return $mime;
   }
@@ -63,22 +63,22 @@ 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
+    if (!array_key_exists($this->get_type(), $_FILES))
       throw new \Exception($this->get_type()." not found in _FILES");
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
+    if (!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
       throw new \Exception('uploaded file has no size');
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
+    if (($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
       throw new \Exception('data sent is not an image but a '.$file_type.'');
 
-    $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
+    $filepath = $this->build_filename().'.'.self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
+		if (file_exists($filepath))
       throw new \Exception($this->get_type()." new path '$filepath' already exists");
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
+		if (copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
 			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
 
     $this->make_thumbnail($filepath);
@@ -86,7 +86,7 @@ 
 
   public function download($url)
   {
-    $filepath = $this->build_filename() . '.' . self::file_ext($url);
+    $filepath = $this->build_filename().'.'.self::file_ext($url);
     $filepath = $this->locate_file($filepath);
 
     \qivive\Curlyb::fetch($url, $filepath);
@@ -101,7 +101,7 @@ 
 		$cover_iri = null;
 
 		$mime_type = mime_content_type($filepath);
-		switch($mime_type)
+		switch ($mime_type)
 		{
 			case 'image/jpeg':
 			case 'image/pjpeg':
@@ -117,21 +117,21 @@ 
 			break;
 		}
 
-		if(!is_null($cover_iri))
+		if (!is_null($cover_iri))
 		{
-			$width = imagesx( $cover_iri );
-			$height = imagesy( $cover_iri );
+			$width = imagesx($cover_iri);
+			$height = imagesy($cover_iri);
 
 			// calculate thumbnail size
       
 			$new_width = $settings[get_class($this->pmi)::model_type()][$this->get_type()]['thumbnail']['width'];
-			$new_height = floor( $height * ( $new_width / $width ) );
+			$new_height = floor($height * ($new_width / $width));
 
 			// create a new temporary image
 			$thumb_iri = imagecreatetruecolor($new_width, $new_height);
 
 			// copy and resize old image into new image
-			imagecopyresized( $thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height );
+			imagecopyresized($thumb_iri, $cover_iri, 0, 0, 0, 0, $new_width, $new_height, $width, $height);
 
 			// save thumbnail into a file
       imagejpeg($thumb_iri, $this->locate_thumbnail(pathinfo($filepath, PATHINFO_BASENAME)));
@@ -142,16 +142,16 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
+    foreach ($filenames as $filename)
 				$this->remove($filename);
 
     $directory = $this->build_path_to_directory();
-		if(file_exists($directory) === true)
+		if (file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
+      if (is_dir($directory) === false)
         throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
 
-   		if(rmdir($directory) === false)
+   		if (rmdir($directory) === false)
   			throw new \Exception("rmdir($directory) failed like a bitch");
     }
     else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
@@ -162,27 +162,27 @@ 
     // removing a picture, and maybe a thumbnail? build the $pathes array accordingly
     $pathes = [];
     $pathes[$this->get_type()] = $this->locate_file($picture_filename);
-    $pathes[$this->get_type() . ' thumbnail'] = $this->locate_thumbnail($picture_filename);
+    $pathes[$this->get_type().' thumbnail'] = $this->locate_thumbnail($picture_filename);
 
     $deleted = [];
     $still_walking = [];
-    foreach($pathes as $what => $path)
+    foreach ($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
+  		if (!file_exists($path))
         $error = 'file does not exist';
-      elseif(unlink($path)===false)
+      elseif (unlink($path) === false)
         $error = 'unlink() failed';
 
-      if(is_null($error))
-        $deleted[]= $what;
+      if (is_null($error))
+        $deleted[] = $what;
       else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
-        $still_walking[]=$what;
+        $still_walking[] = $what;
       }
     }
-    return count($still_walking)===0;
+    return count($still_walking) === 0;
   }
 
   public function locate_thumbnail($filename)
@@ -196,11 +196,11 @@ 
     return $settings['thumbnail']['file_prefix'].''.pathinfo($picture_basename, PATHINFO_FILENAME).'.jpg';
   }
 
-  public static function file_info($absolute_path_to_picture, $what=null)
+  public static function file_info($absolute_path_to_picture, $what = null)
   {
-    $ret = parent::file_info($absolute_path_to_picture, $what=null);
+    $ret = parent::file_info($absolute_path_to_picture, $what = null);
 
-    if(is_array($ret))
+    if (is_array($ret))
     {
       $t = getimagesize($absolute_path_to_picture);
       $ret['width'] = $t[0];
@@ -218,7 +218,7 @@ 
   }
 
 
-  public static function uri_for($item, $picture_type, $thumbnail=true)
+  public static function uri_for($item, $picture_type, $thumbnail = true)
   {
     global $settings;
     $pi_manager = new PictureManager($item, $picture_type);
@@ -226,24 +226,24 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
+    if (count($pictures) === 0)
       return $settings[$item_model_type][$picture_type]['generic_picture'];
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
+		if ($settings[$item_model_type][$picture_type]['cycle_on_load'])
 			$filename = $pictures[array_rand($pictures, 1)];
 		else
 			$filename = array_shift($pictures);
 
-    return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
+    return $thumbnail === true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }
 
   public function last_index()
   {
     $last_index = 0;
-    if(count($filenames = $this->filenames()) > 0)
+    if (count($filenames = $this->filenames()) > 0)
     {
       $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done
-      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
+      if (preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
         throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
 
       $last_index = $last_index[1];
@@ -257,9 +257,9 @@ 
     return sprintf('%s%s.jpg', $settings['thumbnail']['file_prefix'], pathinfo($picture_basename, PATHINFO_FILENAME));
   }
 
-  public function build_filename($index=null)
+  public function build_filename($index = null)
   {
-    if(is_null($index))
+    if (is_null($index))
       $index = $this->last_index()+1;
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
@@ -278,7 +278,7 @@ 
     $new_thumbname_path = $this->locate_file($this->build_thumb_filename($new_filename_path)); //move current to zero
     $this->rename($selected_thumbname_path, $new_thumbname_path);
 
-    for($i=$filename_index-1; $i>=0; --$i)
+    for ($i = $filename_index-1; $i >= 0; --$i)
     {
       $move_this = $this->locate_file($files[$i]);
       $to_that = $this->locate_file($files[$i+1]);

Braces +61 added lines, -43 removed lines

@@ -16,8 +16,9 @@ 
     $picture_directory = $this->build_path_to_directory();
     $thumbnail_directory = $picture_directory;
 
-		if(!file_exists($picture_directory) && mkdir($picture_directory) === false)
-			return [];
+		if(!file_exists($picture_directory) && mkdir($picture_directory) === false) {
+					return [];
+		}
 
     $filenames = self::preg_scandir($picture_directory, '/^[0-9]+_[0-9]+\.[a-zA-Z]+/');// ID_SEQUENCENUMBER.ext
 
@@ -29,8 +30,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $filepathes = [];
-    foreach($filenames as $filename)
-      $filepathes[] = $this->locate_thumbnail($filename);
+    foreach($filenames as $filename) {
+          $filepathes[] = $this->locate_thumbnail($filename);
+    }
 
     return $filepathes;
   }
@@ -39,8 +41,9 @@ 
   {
     $filenames = $this->filenames($replace_by_thumbs_if_exists);
     $uris = [];
-    foreach($filenames as $filename)
-      $uris[] = $this->locate_file($filename);
+    foreach($filenames as $filename) {
+          $uris[] = $this->locate_file($filename);
+    }
 
     dd($uris);
     return $uris;
@@ -55,31 +58,37 @@ 
       'image/gif' => 'imagecreatefromgif',
     );
     $mime = mime_content_type($filepath);
-    if(array_key_exists($mime, $picture_mime_to_gd_create_function))
-      return true;
+    if(array_key_exists($mime, $picture_mime_to_gd_create_function)) {
+          return true;
+    }
     return $mime;
   }
 
 
   public function upload()
   {
-    if(!array_key_exists($this->get_type(), $_FILES))
-      throw new \Exception($this->get_type()." not found in _FILES");
+    if(!array_key_exists($this->get_type(), $_FILES)) {
+          throw new \Exception($this->get_type()." not found in _FILES");
+    }
 
-    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0)
-      throw new \Exception('uploaded file has no size');
+    if(!array_key_exists('size', $_FILES[$this->get_type()]) || $_FILES[$this->get_type()]['size'] == 0) {
+          throw new \Exception('uploaded file has no size');
+    }
 
-    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true)
-      throw new \Exception('data sent is not an image but a '.$file_type.'');
+    if(($file_type = self::is_picture_file($_FILES[$this->get_type()]['tmp_name'])) !== true) {
+          throw new \Exception('data sent is not an image but a '.$file_type.'');
+    }
 
     $filepath = $this->build_filename() . '.' . self::file_ext($_FILES[$this->get_type()]['name']);
     $filepath = $this->locate_file($filepath);
 
-		if(file_exists($filepath))
-      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		if(file_exists($filepath)) {
+		      throw new \Exception($this->get_type()." new path '$filepath' already exists");
+		}
 
-		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false)
-			throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		if(copy($_FILES[$this->get_type()]['tmp_name'], $filepath) === false) {
+					throw new \Exception(" cant copy ".$_FILES[$this->get_type()]['name']." to ($filepath)");
+		}
 
     $this->make_thumbnail($filepath);
   }
@@ -142,19 +151,23 @@ 
   {
     $filenames = $this->filenames();
 
-    foreach($filenames as $filename)
-				$this->remove($filename);
+    foreach($filenames as $filename) {
+    				$this->remove($filename);
+    }
 
     $directory = $this->build_path_to_directory();
 		if(file_exists($directory) === true)
     {
-      if(is_dir($directory) === false)
-        throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      if(is_dir($directory) === false) {
+              throw new \Exception($this->get_type()."' directory '$directory' is not a directory");
+      }
 
-   		if(rmdir($directory) === false)
-  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		if(rmdir($directory) === false) {
+   		  			throw new \Exception("rmdir($directory) failed like a bitch");
+   		}
+    } else {
+      trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
     }
-    else trigger_error($this->get_type()." $directory doesn't exist", E_USER_WARNING);
   }
 
   public function remove($picture_filename)
@@ -169,14 +182,15 @@ 
     foreach($pathes as $what => $path)
     {
       $error = null;
-  		if(!file_exists($path))
-        $error = 'file does not exist';
-      elseif(unlink($path)===false)
-        $error = 'unlink() failed';
-
-      if(is_null($error))
-        $deleted[]= $what;
-      else
+  		if(!file_exists($path)) {
+  		        $error = 'file does not exist';
+  		} elseif(unlink($path)===false) {
+              $error = 'unlink() failed';
+      }
+
+      if(is_null($error)) {
+              $deleted[]= $what;
+      } else
       {
         trigger_error(__FUNCTION__." '$picture_filename' ($what @ $path) impossible because ", E_USER_NOTICE);
         $still_walking[]=$what;
@@ -226,13 +240,15 @@ 
 		$pictures = $pi_manager->filenames();
 
     $item_model_type = get_class($item)::model_type();
-    if(count($pictures)===0)
-      return $settings[$item_model_type][$picture_type]['generic_picture'];
+    if(count($pictures)===0) {
+          return $settings[$item_model_type][$picture_type]['generic_picture'];
+    }
 
-		if($settings[$item_model_type][$picture_type]['cycle_on_load'])
-			$filename = $pictures[array_rand($pictures, 1)];
-		else
-			$filename = array_shift($pictures);
+		if($settings[$item_model_type][$picture_type]['cycle_on_load']) {
+					$filename = $pictures[array_rand($pictures, 1)];
+		} else {
+					$filename = array_shift($pictures);
+		}
 
     return $thumbnail===true ? $pi_manager->locate_thumbnail($filename) : $pi_manager->locate_file($filename);
   }
@@ -243,8 +259,9 @@ 
     if(count($filenames = $this->filenames()) > 0)
     {
       $last_filename = array_pop($filenames); // last cover name FIXME sort should be done here, check cost if sort already done
-      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1)
-        throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      if(preg_match('/[0-9]+\_([0-9]+)\.[a-z]+/', $last_filename, $last_index) !== 1) {
+              throw new \Exception("FAILED_COMPUTING_NEW_INDEX_USING_REGEX");
+      }
 
       $last_index = $last_index[1];
     }
@@ -259,8 +276,9 @@ 
 
   public function build_filename($index=null)
   {
-    if(is_null($index))
-      $index = $this->last_index()+1;
+    if(is_null($index)) {
+          $index = $this->last_index()+1;
+    }
 
     return $this->pmi->id.'_'.sprintf("%'.09d", $index); // prepend bean id
   }

Controllers/Breadcrumb.class.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
     return $this->breadcrumbs;
   }
   
-  public function breadcrumb($show, $route=null)
+  public function breadcrumb($show, $route = null)
   {
-    $this->breadcrumbs[]= ['show' => $show, 'route' => $route];
+    $this->breadcrumbs[] = ['show' => $show, 'route' => $route];
   }
   
   public function reset_breadcrumbs() : array

Controllers/LingvoController.class.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     $headers = explode(',', trim($language_data[0]));
     array_shift($language_data);
 
-    foreach($language_data as $i => $lang)
+    foreach ($language_data as $i => $lang)
     {
       $data = array_combine($headers, explode(',', $lang));
 

TableToForm.class.php

Braces +37 added lines, -41 removed lines

@@ -9,11 +9,13 @@ 
 {
   private static function compute_field_value($model,$field_name)
   {
-    if(method_exists($model,$field_name))
-      return $model->$field_name();
+    if(method_exists($model,$field_name)) {
+          return $model->$field_name();
+    }
 
-    if(property_exists($model,$field_name))
-      return $model->$field_name;
+    if(property_exists($model,$field_name)) {
+          return $model->$field_name;
+    }
 
     return '';
   }
@@ -51,74 +53,66 @@ 
 
     $table = get_class($model)::table();
 
-    if(is_null($table->column($field_name)))
-      return Form::input($field_name,$field_value,$attributes,$errors);
+    if(is_null($table->column($field_name))) {
+          return Form::input($field_name,$field_value,$attributes,$errors);
+    }
 
     $ret = '';
 
     $field = $table->column($field_name);
 
 
-    if(isset($attributes['required']) && $attributes['required'] === false)
-      unset($attributes['required']);
-
-    elseif(!$field->is_nullable())
-      $attributes[] = 'required';
+    if(isset($attributes['required']) && $attributes['required'] === false) {
+          unset($attributes['required']);
+    } elseif(!$field->is_nullable()) {
+          $attributes[] = 'required';
+    }
 
     if($field->is_auto_incremented())
     {
       $ret .= Form::hidden($field->name(),$field_value);
-    }
-    elseif($field->type()->is_boolean())
+    } elseif($field->type()->is_boolean())
     {
       $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
       $ret .= Form::select($field->name(), $option_list ,$field_value, $attributes); //
-    }
-    elseif($field->type()->is_integer())
+    } elseif($field->type()->is_integer())
     {
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_year())
+    } elseif($field->type()->is_year())
     {
       $attributes['size'] = $attributes['maxlength'] = 4;
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_date())
+    } elseif($field->type()->is_date())
     {
       $ret .= Form::date($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_time())
+    } elseif($field->type()->is_time())
     {
       $ret .= Form::time($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_datetime())
+    } elseif($field->type()->is_datetime())
     {
       $ret .= Form::datetime($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_text())
+    } elseif($field->type()->is_text())
     {
       $ret .= Form::textarea($field->name(),$field_value,$attributes,$errors);
-    }
-    elseif($field->type()->is_enum())
+    } elseif($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
-        $enum_values[$e_val] = $e_val;
+      foreach($field->type()->enum_values() as $e_val) {
+              $enum_values[$e_val] = $e_val;
+      }
 
       $selected = $attributes['value'] ?? $field_value ?? '';
       // foreach($field->)
       $ret .= Form::select($field->name(), $enum_values, $selected, $attributes); //
 
       // throw new \Exception('ENUM IS NOT HANDLED BY TableToFom');
-    }
-    elseif($field->type()->is_string())
+    } elseif($field->type()->is_string())
     {
       $max_length = $field->type()->length();
       $attributes['size'] = $attributes['maxlength'] = $max_length;
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
-    }
-    else
+    } else
     {
       $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
     }
@@ -130,8 +124,9 @@ 
   public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
-      unset($field_attributes['label']);
+    if(isset($attributes['label'])) {
+          unset($field_attributes['label']);
+    }
 
     return sprintf('%s %s', self::label($model,$field_name,$attributes,$errors), self::field($model,$field_name,$field_attributes,$errors));
   }
@@ -148,14 +143,15 @@ 
       $form_field = '';
       if($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
-      }
-      else
+        if(!$model->is_new()) {
+                  $form_field = self::field($model,$column_name);
+        }
+      } else
       {
         $form_field = self::field_with_label($model,$column_name);
-        if(!is_null($group_class))
-          $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        if(!is_null($group_class)) {
+                  $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        }
       }
       $ret .= PHP_EOL.$form_field;
     }

Spacing +44 added lines, -44 removed lines

@@ -3,26 +3,26 @@ 
 namespace HexMakina\kadro;
 
 use \HexMakina\Crudites\Interfaces\ModelInterface;
-use \HexMakina\Format\HTML\{Form,Element};
+use \HexMakina\Format\HTML\{Form, Element};
 
 class TableToForm
 {
-  private static function compute_field_value($model,$field_name)
+  private static function compute_field_value($model, $field_name)
   {
-    if(method_exists($model,$field_name))
+    if (method_exists($model, $field_name))
       return $model->$field_name();
 
-    if(property_exists($model,$field_name))
+    if (property_exists($model, $field_name))
       return $model->$field_name;
 
     return '';
   }
 
-  public static function label($model,$field_name,$attributes=[],$errors=[])
+  public static function label($model, $field_name, $attributes = [], $errors = [])
   {
     $label_content = $field_name;
 
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
     {
       $label_content = $attributes['label'];
       unset($attributes['label']);
@@ -44,66 +44,66 @@ 
     return $ret;
   }
 
-  public static function field(ModelInterface $model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field(ModelInterface $model, $field_name, $attributes = [], $errors = []) : string
   {
-    $field_value = $attributes['value'] ?? self::compute_field_value($model,$field_name);
+    $field_value = $attributes['value'] ?? self::compute_field_value($model, $field_name);
     $attributes['name'] = $attributes['name'] ?? $field_name;
 
     $table = get_class($model)::table();
 
-    if(is_null($table->column($field_name)))
-      return Form::input($field_name,$field_value,$attributes,$errors);
+    if (is_null($table->column($field_name)))
+      return Form::input($field_name, $field_value, $attributes, $errors);
 
     $ret = '';
 
     $field = $table->column($field_name);
 
 
-    if(isset($attributes['required']) && $attributes['required'] === false)
+    if (isset($attributes['required']) && $attributes['required'] === false)
       unset($attributes['required']);
 
-    elseif(!$field->is_nullable())
+    elseif (!$field->is_nullable())
       $attributes[] = 'required';
 
-    if($field->is_auto_incremented())
+    if ($field->is_auto_incremented())
     {
-      $ret .= Form::hidden($field->name(),$field_value);
+      $ret .= Form::hidden($field->name(), $field_value);
     }
-    elseif($field->type()->is_boolean())
+    elseif ($field->type()->is_boolean())
     {
       $option_list = $attributes['values'] ?? [0 => 0, 1 => 1];
-      $ret .= Form::select($field->name(), $option_list ,$field_value, $attributes); //
+      $ret .= Form::select($field->name(), $option_list, $field_value, $attributes); //
     }
-    elseif($field->type()->is_integer())
+    elseif ($field->type()->is_integer())
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_year())
+    elseif ($field->type()->is_year())
     {
       $attributes['size'] = $attributes['maxlength'] = 4;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_date())
+    elseif ($field->type()->is_date())
     {
-      $ret .= Form::date($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::date($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_time())
+    elseif ($field->type()->is_time())
     {
-      $ret .= Form::time($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::time($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_datetime())
+    elseif ($field->type()->is_datetime())
     {
-      $ret .= Form::datetime($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::datetime($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_text())
+    elseif ($field->type()->is_text())
     {
-      $ret .= Form::textarea($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::textarea($field->name(), $field_value, $attributes, $errors);
     }
-    elseif($field->type()->is_enum())
+    elseif ($field->type()->is_enum())
     {
 
       $enum_values = [];
-      foreach($field->type()->enum_values() as $e_val)
+      foreach ($field->type()->enum_values() as $e_val)
         $enum_values[$e_val] = $e_val;
 
       $selected = $attributes['value'] ?? $field_value ?? '';
@@ -112,50 +112,50 @@ 
 
       // throw new \Exception('ENUM IS NOT HANDLED BY TableToFom');
     }
-    elseif($field->type()->is_string())
+    elseif ($field->type()->is_string())
     {
       $max_length = $field->type()->length();
       $attributes['size'] = $attributes['maxlength'] = $max_length;
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
     else
     {
-      $ret .= Form::input($field->name(),$field_value,$attributes,$errors);
+      $ret .= Form::input($field->name(), $field_value, $attributes, $errors);
     }
 
 
     return $ret;
   }
 
-  public static function field_with_label($model,$field_name,$attributes=[],$errors=[]) : string
+  public static function field_with_label($model, $field_name, $attributes = [], $errors = []) : string
   {
     $field_attributes = $attributes;
-    if(isset($attributes['label']))
+    if (isset($attributes['label']))
       unset($field_attributes['label']);
 
-    return sprintf('%s %s', self::label($model,$field_name,$attributes,$errors), self::field($model,$field_name,$field_attributes,$errors));
+    return sprintf('%s %s', self::label($model, $field_name, $attributes, $errors), self::field($model, $field_name, $field_attributes, $errors));
   }
 
 
-  public static function fields(ModelInterface $model,$group_class=null) : string
+  public static function fields(ModelInterface $model, $group_class = null) : string
   {
     $table = get_class($model)::table();
     $ret = '';
-    foreach($table->columns() as $column_name => $column)
+    foreach ($table->columns() as $column_name => $column)
     {
       // vd($column_name);
 
       $form_field = '';
-      if($column->is_auto_incremented())
+      if ($column->is_auto_incremented())
       {
-        if(!$model->is_new())
-          $form_field = self::field($model,$column_name);
+        if (!$model->is_new())
+          $form_field = self::field($model, $column_name);
       }
       else
       {
-        $form_field = self::field_with_label($model,$column_name);
-        if(!is_null($group_class))
-          $form_field = new Element('div',$form_field, ['class' => $group_class]);
+        $form_field = self::field_with_label($model, $column_name);
+        if (!is_null($group_class))
+          $form_field = new Element('div', $form_field, ['class' => $group_class]);
       }
       $ret .= PHP_EOL.$form_field;
     }

Models/Lingvo.class.php

Indentation +7 added lines, -7 removed lines

@@ -31,10 +31,10 @@ 
     return $this->iso_name().' ('.$this->Part3.')';
   }
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
 
   public function iso_name()
   {
@@ -102,9 +102,9 @@ 
   public static function search_language($term, $authority=null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
-		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+    $ret = [];
+    foreach($rows as $row)
+        $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
   }

Spacing +10 added lines, -10 removed lines

@@ -52,39 +52,39 @@ 
   }
 
 
-  public static function query_retrieve($filter=[], $options=[]) : \HexMakina\Crudites\Queries\BaseQuery
+  public static function query_retrieve($filter = [], $options = []) : \HexMakina\Crudites\Queries\BaseQuery
   {
 
     $searchable_fields = [self::ISO_NAME, self::ISO_3, self::ISO_2B, self::ISO_2T, self::ISO_1];
 
     $Query = static::table()->select();
 
-    if(isset($filter['name']))
+    if (isset($filter['name']))
     {
 
     }
 
-    if(isset($filter['code']))
+    if (isset($filter['code']))
     {
 
     }
 
-    if(isset($filter['term']))
+    if (isset($filter['term']))
     {
       $Query->aw_filter_content(['term' => $filter['term'], 'fields' => $searchable_fields], $Query->table_label(), 'OR');
     }
 
-    if(isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
+    if (isset($filter['requires_authority']) && isset(self::ISO_SETS[$filter['requires_authority']]))
     {
       $Query->aw_not_empty($filter['requires_authority']);
     }
 
-    if(isset($filter['types']))
+    if (isset($filter['types']))
     {
       $wc = sprintf('AND Type IN (\'%s\') ', implode('\', \'', array_keys(self::types())));
       $Query->and_where($wc);
     }
-    if(isset($filter['scopes']))
+    if (isset($filter['scopes']))
     {
       $wc = sprintf('AND Scope IN (\'%s\') ', implode('\', \'', array_keys(self::scopes())));
       $Query->and_where($wc);
@@ -99,11 +99,11 @@ 
     return $Query;
   }
 
-  public static function search_language($term, $authority=null)
+  public static function search_language($term, $authority = null)
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
 
     return $ret;
@@ -115,7 +115,7 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if (isset($rows[0])) // only 1 result
       return current($rows);
 
     return null; // no results

Braces +6 added lines, -3 removed lines

@@ -103,8 +103,9 @@ 
   {
     $rows = self::query_retrieve(['term' => $term, 'requires_authority' => $authority])->ret_ass();
 		$ret = [];
-		foreach($rows as $row)
-		   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		foreach($rows as $row) {
+				   $ret[$row[self::ISO_3]] = $row[self::ISO_NAME];
+		}
 
     return $ret;
   }
@@ -115,8 +116,10 @@ 
     $Query->aw_eq(self::ISO_3, $code);
     $rows = $Query->ret_col();
 
-    if(isset($rows[0])) // only 1 result
+    if(isset($rows[0])) {
+      // only 1 result
       return current($rows);
+    }
 
     return null; // no results
   }

Models/Traduko.class.php

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
   const TABLE_NAME = 'kadro_traduki';
   const TABLE_ALIAS = 'traduko';
 
-	public function traceable() : bool
-	{
-		return false;
-	}
+  public function traceable() : bool
+  {
+    return false;
+  }
   
   public function immortal() : bool
   {

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     return false;
   }
   
-  public static function query_retrieve($filters=[], $options=[]) : Select
+  public static function query_retrieve($filters = [], $options = []) : Select
   {
     $Query = static::table()->select();
     $Query->order_by(['kategorio', 'ASC']);

Models/Abilities/Event.class.php

Indentation +12 added lines, -12 removed lines

@@ -23,22 +23,22 @@
 
   public static function today($format=Dato::FORMAT)
   {
-		return Dato::today($format);
-	}
+    return Dato::today($format);
+  }
 
   public static function date($date=null, $format=Dato::FORMAT) : string
-	{
-		return Dato::format($date);
-	}
+  {
+    return Dato::format($date);
+  }
   //
   // //------------------------------------------------------------  MySQL DateTime helpers
   // public static function year($date=null) : string
-	// {
-	// 	return Dato::format($date, Dato::FORMAT_YEAR);
-	// }
+  // {
+  // 	return Dato::format($date, Dato::FORMAT_YEAR);
+  // }
   //
-	// public static function datetime($date=null) : string
-	// {
-	// 	return DatoTempo::format($date);
-	// }
+  // public static function datetime($date=null) : string
+  // {
+  // 	return DatoTempo::format($date);
+  // }
 }

Spacing +2 added lines, -2 removed lines

@@ -21,12 +21,12 @@
     return $this->__toString();
   }
 
-  public static function today($format=Dato::FORMAT)
+  public static function today($format = Dato::FORMAT)
   {
 		return Dato::today($format);
 	}
 
-  public static function date($date=null, $format=Dato::FORMAT) : string
+  public static function date($date = null, $format = Dato::FORMAT) : string
 	{
 		return Dato::format($date);
 	}

Container/LeMarchand.class.php

Spacing +11 added lines, -11 removed lines

@@ -16,7 +16,7 @@ 
   public function __debugInfo()
   {
     $dbg = get_object_vars($this);
-    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine'])? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
+    $dbg['configurations']['template_engine'] = isset($dbg['configurations']['template_engine']) ? get_class($dbg['configurations']['template_engine']) : 'NOT SET';
 
     return $dbg;
   }
@@ -34,45 +34,45 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
+    if (!is_string($configuration))
       throw new LamentException($configuration);
 
-    if($this->has($configuration))
+    if ($this->has($configuration))
       return $this->configurations[$configuration];
 
     
     // fallbacks
-    if(preg_match('/^settings\./', $configuration, $m) === 1)
+    if (preg_match('/^settings\./', $configuration, $m) === 1)
     {
       $ret = $this->configurations;
-      foreach(explode('.', $configuration) as $k)
+      foreach (explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
+        if (!isset($ret[$k]))
           throw new ConfigurationException($configuration);
         $ret = $ret[$k];
       }
 
       return $ret;
     }
-    elseif(class_exists($configuration)) // auto create instances
+    elseif (class_exists($configuration)) // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
 
       $construction_args = [];
       $instance = null;
-      if(!is_null($rc->getConstructor()))
+      if (!is_null($rc->getConstructor()))
       {
-        foreach($rc->getConstructor()->getParameters() as $param)
+        foreach ($rc->getConstructor()->getParameters() as $param)
         {
-          $construction_args []= $this->get($param->getType().'');
+          $construction_args [] = $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
       }
       else 
         $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
+      if ($rc->hasMethod('set_container'))
         $instance->set_container($this);
       
       return $instance;

Braces +17 added lines, -12 removed lines

@@ -34,11 +34,13 @@ 
   public function get($configuration)
   {
     
-    if(!is_string($configuration))
-      throw new LamentException($configuration);
+    if(!is_string($configuration)) {
+          throw new LamentException($configuration);
+    }
 
-    if($this->has($configuration))
-      return $this->configurations[$configuration];
+    if($this->has($configuration)) {
+          return $this->configurations[$configuration];
+    }
 
     
     // fallbacks
@@ -47,17 +49,19 @@ 
       $ret = $this->configurations;
       foreach(explode('.', $configuration) as $k)
       {
-        if(!isset($ret[$k]))
-          throw new ConfigurationException($configuration);
+        if(!isset($ret[$k])) {
+                  throw new ConfigurationException($configuration);
+        }
         $ret = $ret[$k];
       }
 
       return $ret;
-    }
-    elseif(class_exists($configuration)) // auto create instances
+    } elseif(class_exists($configuration)) {
+      // auto create instances
     {
       
       $rc = new \ReflectionClass($configuration);
+    }
 
       $construction_args = [];
       $instance = null;
@@ -68,12 +72,13 @@ 
           $construction_args []= $this->get($param->getType().'');
         }
         $instance = $rc->newInstanceArgs($construction_args);
+      } else {
+              $instance = $rc->newInstanceArgs();
       }
-      else 
-        $instance = $rc->newInstanceArgs();
 
-      if($rc->hasMethod('set_container'))
-        $instance->set_container($this);
+      if($rc->hasMethod('set_container')) {
+              $instance->set_container($this);
+      }
       
       return $instance;
     }

Logger/LogLaddy.class.php

Indentation +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
    * const NOTICE    = 'notice'; // Normal but significant events.
    * const INFO      = 'info'; // Interesting events. User logs in, SQL logs.
    * const DEBUG     = 'debug'; // Detailed debug information.
-  */
+   */
   private static function map_error_level_to_log_level($level) : string
   {
     // http://php.net/manual/en/errorfunc.constants.php

Braces +43 added lines, -30 removed lines

@@ -68,11 +68,11 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
-      (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
-      (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
-    else
+    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') {
+          (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
+    } elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') {
+          (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
+    } else
     {
       die('This Throwable is not an Error or an Exception. This is unfortunate.');
     }
@@ -108,15 +108,15 @@ 
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    elseif($this->system_halted($level)) // analyses error level
+    } elseif($this->system_halted($level)) {
+      // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
+    }
       error_log($display_error);
       $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
-    }
-    else
+    } else
     {// --- Handles user messages, through SESSION storage
       $this->report_to_user($level, $message, $context);
     }
@@ -165,11 +165,13 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
-      $_SESSION[self::REPORTING_USER] = [];
+    if(!isset($_SESSION[self::REPORTING_USER])) {
+          $_SESSION[self::REPORTING_USER] = [];
+    }
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
-      $_SESSION[self::REPORTING_USER][$level] = [];
+    if(!isset($_SESSION[self::REPORTING_USER][$level])) {
+          $_SESSION[self::REPORTING_USER][$level] = [];
+    }
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
   }
@@ -206,9 +208,11 @@ 
   public function changes($options=[])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
-      $limit = 1000;
-    else  $limit = intval($options['limit']);
+    if(!isset($options['limit']) || empty($options['limit'])) {
+          $limit = 1000;
+    } else {
+      $limit = intval($options['limit']);
+    }
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
     $table = Crudites::inspect(self::LOG_TABLE_NAME);
@@ -226,16 +230,22 @@ 
 
     foreach($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if(preg_match('/id/', $o)) {
+            $q->aw_eq('query_id', $v);
+          } elseif(preg_match('/tables/', $o)) {
+        $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/table/', $o)) {
+        $q->aw_eq('query_table', $v);
+      } elseif(preg_match('/(type|action)/', $o)) {
+        $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      } elseif(preg_match('/(date|query_on)/', $o)) {
+        $q->aw_like('query_on', "$v%");
+      } elseif(preg_match('/(oper|user|query_by)/', $o)) {
+        $q->aw_eq('query_by', $v);
+      }
     }
 
-    try{$q->run();}
-    catch(CruditesException $e){vdt($e);return false;}
+    try{$q->run();} catch(CruditesException $e){vdt($e);return false;}
 
     $res = $q->ret_num(); // ret num to list()
     // ddt($res);
@@ -245,10 +255,12 @@ 
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
-        $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
-        $ret[$working_day][$class] = [];
+      if(!isset($ret[$working_day])) {
+              $ret[$working_day] = [];
+      }
+      if(!isset($ret[$working_day][$class])) {
+              $ret[$working_day][$class] = [];
+      }
 
       $ret[$working_day][$class][$instance_id] = $logs;
     }
@@ -282,8 +294,9 @@ 
     $m[E_STRICT]=$m[E_DEPRECATED]=$m[E_USER_DEPRECATED]=$m[E_ALL]=LogLevel::DEBUG;
     $m[2048]=$m[8192]=$m[16384]=$m[32767]=LogLevel::DEBUG;
 
-    if(isset($m[$level]))
-      return $m[$level];
+    if(isset($m[$level])) {
+          return $m[$level];
+    }
 
     throw new \Exception(__FUNCTION__."($level): $level is unknown");
   }

Spacing +35 added lines, -35 removed lines

@@ -11,7 +11,7 @@ 
 
 namespace HexMakina\kadro\Logger;
 
-use \HexMakina\Crudites\{Crudites,CruditesException,Table};
+use \HexMakina\Crudites\{Crudites, CruditesException, Table};
 use \HexMakina\Crudites\TableInterface;
 
 
@@ -68,9 +68,9 @@ 
     $context['class'] = get_class($throwable);
     $context['trace'] = $throwable->getTrace();
 
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
+    if (is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
       (new LogLaddy())->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
+    elseif (is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
       (new LogLaddy())->notice(self::USER_EXCEPTION, $context);
     else
     {
@@ -82,7 +82,7 @@ 
   public function system_halted($level)
   {
 
-    switch($level)
+    switch ($level)
     {
       case LogLevel::ERROR:
       case LogLevel::CRITICAL:
@@ -101,19 +101,19 @@ 
     $display_error = null;
 
     // --- Handles Throwables (exception_handler())
-    if($message==self::INTERNAL_ERROR || $message== self::USER_EXCEPTION)
+    if ($message == self::INTERNAL_ERROR || $message == self::USER_EXCEPTION)
     {
       $this->has_halting_messages = true;
       $display_error = \HexMakina\Debugger\Debugger::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
-    elseif($this->system_halted($level)) // analyses error level
+    elseif ($this->system_halted($level)) // analyses error level
     {
       $display_error = sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, \HexMakina\Debugger\Debugger::format_file($context['file']), $context['line'], $message);
       error_log($display_error);
-      $display_error.= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
+      $display_error .= \HexMakina\Debugger\Debugger::format_trace($context['trace'], false);
       self::HTTP_500($display_error);
     }
     else
@@ -165,10 +165,10 @@ 
   // ----------------------------------------------------------- User messages:add one
   public function report_to_user($level, $message, $context = [])
   {
-    if(!isset($_SESSION[self::REPORTING_USER]))
+    if (!isset($_SESSION[self::REPORTING_USER]))
       $_SESSION[self::REPORTING_USER] = [];
 
-    if(!isset($_SESSION[self::REPORTING_USER][$level]))
+    if (!isset($_SESSION[self::REPORTING_USER][$level]))
       $_SESSION[self::REPORTING_USER][$level] = [];
 
     $_SESSION[self::REPORTING_USER][$level][] = [$message, $context];
@@ -203,16 +203,16 @@ 
   // }
 
   // ----------------------------------------------------------- CRUD Tracking:get for many models
-  public function changes($options=[])
+  public function changes($options = [])
   {
 
-    if(!isset($options['limit']) || empty($options['limit']))
+    if (!isset($options['limit']) || empty($options['limit']))
       $limit = 1000;
     else  $limit = intval($options['limit']);
 
     // TODO SELECT field order can't change without adapting the result parsing code (foreach $res)
     $table = Crudites::inspect(self::LOG_TABLE_NAME);
-    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id',  'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
+    $select_fields = ['SUBSTR(query_on, 1, 10) AS working_day', 'query_table', 'query_id', 'GROUP_CONCAT(DISTINCT query_type, "-", query_by) as action_by'];
     $q = $table->select($select_fields);
     $q->order_by(['', 'working_day', 'DESC']);
     $q->order_by([self::LOG_TABLE_NAME, 'query_table', 'DESC']);
@@ -224,30 +224,30 @@ 
     $q->having("action_by NOT LIKE '%D%'");
     $q->limit($limit);
 
-    foreach($options as $o => $v)
+    foreach ($options as $o => $v)
     {
-          if(preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
-      elseif(preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
-      elseif(preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
-      elseif(preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
-      elseif(preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
+          if (preg_match('/id/', $o))                    $q->aw_eq('query_id', $v);
+      elseif (preg_match('/tables/', $o))                $q->aw_string_in('query_table', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/table/', $o))                 $q->aw_eq('query_table', $v);
+      elseif (preg_match('/(type|action)/', $o))         $q->aw_string_in('query_type', is_array($v) ? $v : [$v]);
+      elseif (preg_match('/(date|query_on)/', $o))       $q->aw_like('query_on', "$v%");
+      elseif (preg_match('/(oper|user|query_by)/', $o))  $q->aw_eq('query_by', $v);
     }
 
-    try{$q->run();}
-    catch(CruditesException $e){vdt($e);return false;}
+    try {$q->run(); }
+    catch (CruditesException $e) {vdt($e); return false; }
 
     $res = $q->ret_num(); // ret num to list()
     // ddt($res);
     $ret = [];
 
-    foreach($res as $r)
+    foreach ($res as $r)
     {
       list($working_day, $class, $instance_id, $logs) = $r;
 
-      if(!isset($ret[$working_day]))
+      if (!isset($ret[$working_day]))
         $ret[$working_day] = [];
-      if(!isset($ret[$working_day][$class]))
+      if (!isset($ret[$working_day][$class]))
         $ret[$working_day][$class] = [];
 
       $ret[$working_day][$class][$instance_id] = $logs;
@@ -269,21 +269,21 @@ 
   private static function map_error_level_to_log_level($level) : string
   {
     // http://php.net/manual/en/errorfunc.constants.php
-    $m=[];
+    $m = [];
 
-    $m[E_ERROR]=$m[E_PARSE]=$m[E_CORE_ERROR]=$m[E_COMPILE_ERROR]=$m[E_USER_ERROR]=$m[E_RECOVERABLE_ERROR]=LogLevel::ALERT;
-    $m[1]=$m[4]=$m[16]=$m[64]=$m[256]=$m[4096]=LogLevel::ALERT;
+    $m[E_ERROR] = $m[E_PARSE] = $m[E_CORE_ERROR] = $m[E_COMPILE_ERROR] = $m[E_USER_ERROR] = $m[E_RECOVERABLE_ERROR] = LogLevel::ALERT;
+    $m[1] = $m[4] = $m[16] = $m[64] = $m[256] = $m[4096] = LogLevel::ALERT;
 
-    $m[E_WARNING]=$m[E_CORE_WARNING]=$m[E_COMPILE_WARNING]=$m[E_USER_WARNING]=LogLevel::CRITICAL;
-    $m[2]=$m[32]=$m[128]=$m[512]=LogLevel::CRITICAL;
+    $m[E_WARNING] = $m[E_CORE_WARNING] = $m[E_COMPILE_WARNING] = $m[E_USER_WARNING] = LogLevel::CRITICAL;
+    $m[2] = $m[32] = $m[128] = $m[512] = LogLevel::CRITICAL;
 
-    $m[E_NOTICE]=$m[E_USER_NOTICE]=LogLevel::ERROR;
-    $m[8]=$m[1024]=LogLevel::ERROR;
+    $m[E_NOTICE] = $m[E_USER_NOTICE] = LogLevel::ERROR;
+    $m[8] = $m[1024] = LogLevel::ERROR;
 
-    $m[E_STRICT]=$m[E_DEPRECATED]=$m[E_USER_DEPRECATED]=$m[E_ALL]=LogLevel::DEBUG;
-    $m[2048]=$m[8192]=$m[16384]=$m[32767]=LogLevel::DEBUG;
+    $m[E_STRICT] = $m[E_DEPRECATED] = $m[E_USER_DEPRECATED] = $m[E_ALL] = LogLevel::DEBUG;
+    $m[2048] = $m[8192] = $m[16384] = $m[32767] = LogLevel::DEBUG;
 
-    if(isset($m[$level]))
+    if (isset($m[$level]))
       return $m[$level];
 
     throw new \Exception(__FUNCTION__."($level): $level is unknown");