HexMakina / LogLaddy

LogLaddy.php

Spacing +38 added lines, -38 removed lines

@@ -13,15 +13,15 @@ 
 
 class LogLaddy implements LoggerInterface
 {
-  use \Psr\Log\LoggerTrait;           // PSR implementation
-  use \HexMakina\Debugger\Debugger;   // Debugger
+  use \Psr\Log\LoggerTrait; // PSR implementation
+  use \HexMakina\Debugger\Debugger; // Debugger
 
-  const REPORTING_USER = 'user_messages';
-  const INTERNAL_ERROR = 'error';
-  const USER_EXCEPTION = 'exception';
-  const LOG_LEVEL_SUCCESS = 'ok';
+  const REPORTING_USER='user_messages';
+  const INTERNAL_ERROR='error';
+  const USER_EXCEPTION='exception';
+  const LOG_LEVEL_SUCCESS='ok';
 
-  private $has_halting_messages = false;
+  private $has_halting_messages=false;
 
   /**
    * Everything went fine, which is always nice.
@@ -32,15 +32,15 @@ 
    * @return void
    */
 
-  public function nice($message, array $context = array())
+  public function nice($message, array $context=array())
   {
       $this->log(LogLevel::NICE, $message, $context);
   }
 
   // -- Static handlers for error, use set_error_handler('\HexMakina\kadro\Logger\LogLaddy::error_handler')
-  public static function error_handler($level, $message, $file = '', $line = 0)
+  public static function error_handler($level, $message, $file='', $line=0)
   {
-    $loglevel = self::map_error_level_to_log_level($level);
+    $loglevel=self::map_error_level_to_log_level($level);
 
     (new LogLaddy())->$loglevel($message, ['file' => $file, 'line' => $line, 'trace' => debug_backtrace()]);
   }
@@ -48,18 +48,18 @@ 
   // -- Static handlers for throwables, use set_exception_handler('\HexMakina\kadro\Logger\LogLaddy::exception_handler');
   public static function exception_handler(\Throwable $throwable)
   {
-    $context = [];
-    $context['text'] = $throwable->getMessage();
-    $context['file'] = $throwable->getFile();
-    $context['line'] = $throwable->getLine();
-    $context['code'] = $throwable->getCode();
-    $context['class'] = get_class($throwable);
-    $context['trace'] = $throwable->getTrace();
-
-    $lad = new LogLaddy();
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
+    $context=[];
+    $context['text']=$throwable->getMessage();
+    $context['file']=$throwable->getFile();
+    $context['line']=$throwable->getLine();
+    $context['code']=$throwable->getCode();
+    $context['class']=get_class($throwable);
+    $context['trace']=$throwable->getTrace();
+
+    $lad=new LogLaddy();
+    if (is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
       $lad->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')
       $lad->notice(self::USER_EXCEPTION, $context);
     else
       $lad->critical('Caught a Throwable that is not an Error or an Exception. This breaks everything.', $context);
@@ -67,7 +67,7 @@ 
 
   public function system_halted($level)
   {
-    switch($level)
+    switch ($level)
     {
       case LogLevel::ERROR:
       case LogLevel::CRITICAL:
@@ -80,24 +80,24 @@ 
 
   // -- Implementation of LoggerInterface::log(), all other methods are in LoggerTrait
 
-  public function log($level, $message, array $context = [])
+  public function log($level, $message, array $context=[])
   {
-    $display_error = null;
+    $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 = self::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
+      $this->has_halting_messages=true;
+      $display_error=self::format_throwable_message($context['class'], $context['code'], $context['file'], $context['line'], $context['text']);
       error_log($display_error);
-      $display_error.= self::format_trace($context['trace'], false);
+      $display_error.=self::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, self::format_file($context['file']), $context['line'], $message);
+      $display_error=sprintf(PHP_EOL.'%s in file %s:%d'.PHP_EOL.'%s', $level, self::format_file($context['file']), $context['line'], $message);
       error_log($display_error);
-      $display_error.= self::format_trace($context['trace'], true);
+      $display_error.=self::format_trace($context['trace'], true);
       self::HTTP_500($display_error);
     }
     else
@@ -122,15 +122,15 @@ 
   // -- User messages
 
   // -- User messages:add one
-  public function report_to_user($level, $message, $context = [])
+  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];
+    $_SESSION[self::REPORTING_USER][$level][]=[$message, $context];
   }
 
   // -- User messages:get all
@@ -173,7 +173,7 @@ 
     $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 +20 added lines, -16 removed lines

@@ -57,12 +57,13 @@ 
     $context['trace'] = $throwable->getTrace();
 
     $lad = new LogLaddy();
-    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error')
-      $lad->alert(self::INTERNAL_ERROR, $context);
-    elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception')
-      $lad->notice(self::USER_EXCEPTION, $context);
-    else
-      $lad->critical('Caught a Throwable that is not an Error or an Exception. This breaks everything.', $context);
+    if(is_subclass_of($throwable, 'Error') || get_class($throwable) === 'Error') {
+          $lad->alert(self::INTERNAL_ERROR, $context);
+    } elseif(is_subclass_of($throwable, 'Exception') || get_class($throwable) === 'Exception') {
+          $lad->notice(self::USER_EXCEPTION, $context);
+    } else {
+          $lad->critical('Caught a Throwable that is not an Error or an Exception. This breaks everything.', $context);
+    }
   }
 
   public function system_halted($level)
@@ -92,15 +93,15 @@ 
       error_log($display_error);
       $display_error.= self::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, self::format_file($context['file']), $context['line'], $message);
+    }
       error_log($display_error);
       $display_error.= self::format_trace($context['trace'], true);
       self::HTTP_500($display_error);
-    }
-    else
+    } else
     {// --- Handles user messages, through SESSION storage
       $this->report_to_user($level, $message, $context);
     }
@@ -124,11 +125,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];
   }
@@ -173,8 +176,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");
   }