HexMakina / kadro

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

Spacing +34 added lines, -34 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;
@@ -270,19 +270,19 @@ 
   {
     // http://php.net/manual/en/errorfunc.constants.php
 
-    $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");

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");
   }