grommunio / grommunio-dav

lib/GLogger.php

Indentation +53 added lines, -53 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param mixed $name
 	 */
 	public function __construct($name) {
-        $this->logger = self::$parentLogger->withName($name);
+		$this->logger = self::$parentLogger->withName($name);
 
 		// keep an output puffer in case we do debug logging
 		if ($this->logger->isHandling(Logger::DEBUG)) {
@@ -53,82 +53,82 @@ 
 	 */
 	public static function configure($configuration = null) {
 
-        // Load configuration from ini-file if a file path (string) is given
-        if (is_string($configuration)) {
-            $configuration = parse_ini_file($configuration);
-            if (!is_array($configuration))
-                throw new \Exception('Invalid GLogger configuration file');
-        } elseif (!is_array($configuration)) {
-            throw new \Exception('GLogger configuration should be either a string with path to the configuration file, or a configuration array');
-        }
+		// Load configuration from ini-file if a file path (string) is given
+		if (is_string($configuration)) {
+			$configuration = parse_ini_file($configuration);
+			if (!is_array($configuration))
+				throw new \Exception('Invalid GLogger configuration file');
+		} elseif (!is_array($configuration)) {
+			throw new \Exception('GLogger configuration should be either a string with path to the configuration file, or a configuration array');
+		}
 
-        // Log level
-        if (!isset($configuration['level']))
-            $configuration['level'] = 'INFO';
-        elseif (!is_string($configuration['level'])) {
-            throw new \Exception('GLogger configuration parameter "level" is not a string');
-        }
+		// Log level
+		if (!isset($configuration['level']))
+			$configuration['level'] = 'INFO';
+		elseif (!is_string($configuration['level'])) {
+			throw new \Exception('GLogger configuration parameter "level" is not a string');
+		}
 
-        $configuration['level'] = strtoupper($configuration['level']);
-        $allLogLevels = Logger::getLevels();
+		$configuration['level'] = strtoupper($configuration['level']);
+		$allLogLevels = Logger::getLevels();
 
-        if (!isset($allLogLevels[$configuration['level']]))
-            throw new \Exception('GLogger configuration parameter "level" is not known');
+		if (!isset($allLogLevels[$configuration['level']]))
+			throw new \Exception('GLogger configuration parameter "level" is not known');
 
-        $logLevel = $allLogLevels[$configuration['level']];
+		$logLevel = $allLogLevels[$configuration['level']];
 
-        // Parent logger class
-        static::$parentLogger = new Logger('');
+		// Parent logger class
+		static::$parentLogger = new Logger('');
 
-        // Without configuration parameter 'file' all log messages will go to error_log()
-        if (isset($configuration['file'])) {
-            if (!is_string($configuration['file']))
-                throw new \Exception('GLogger configuration parameter "file" is not a string');
+		// Without configuration parameter 'file' all log messages will go to error_log()
+		if (isset($configuration['file'])) {
+			if (!is_string($configuration['file']))
+				throw new \Exception('GLogger configuration parameter "file" is not a string');
 
-            $stream = new StreamHandler($configuration['file'], $logLevel);
-        } else {
-            $stream = new ErrorLogHandler(ErrorLogHandler::OPERATING_SYSTEM, $logLevel);
-        }
+			$stream = new StreamHandler($configuration['file'], $logLevel);
+		} else {
+			$stream = new ErrorLogHandler(ErrorLogHandler::OPERATING_SYSTEM, $logLevel);
+		}
 
-        // Log messages formatting
-        $lineFormat = null;
+		// Log messages formatting
+		$lineFormat = null;
 
-        if (isset($configuration['lineFormat'])
-            && is_string($configuration['lineFormat']))
-            $lineFormat = stripcslashes($configuration['lineFormat']); // stripcslashes to recognize "\n"
+		if (isset($configuration['lineFormat'])
+			&& is_string($configuration['lineFormat']))
+			$lineFormat = stripcslashes($configuration['lineFormat']); // stripcslashes to recognize "\n"
 
-        $timeFormat = null;
+		$timeFormat = null;
 
-        if (isset($configuration['timeFormat'])
-            && is_string($configuration['timeFormat']))
-            $timeFormat = $configuration['timeFormat'];
+		if (isset($configuration['timeFormat'])
+			&& is_string($configuration['timeFormat']))
+			$timeFormat = $configuration['timeFormat'];
 
-        if ($lineFormat
-            || $timeFormat) {
+		if ($lineFormat
+			|| $timeFormat) {
 
-            $formatter = new LineFormatter($lineFormat, $timeFormat, true, true);
-            $stream->setFormatter($formatter);
-        }
+			$formatter = new LineFormatter($lineFormat, $timeFormat, true, true);
+			$stream->setFormatter($formatter);
+		}
 
-        static::$parentLogger->pushHandler($stream);
+		static::$parentLogger->pushHandler($stream);
 
-        // Add processor id (pid) to log messages
-        static::$parentLogger->pushProcessor(new ProcessIdProcessor());
+		// Add processor id (pid) to log messages
+		static::$parentLogger->pushProcessor(new ProcessIdProcessor());
 	}
 
 	/**
 	 * Destroy configurations for logger definitions.
 	 */
 	public function resetConfiguration() {
-        if (static::$parentLogger) {
-            static::$parentLogger->reset();
-            static::$parentLogger = null;
-        }
+		if (static::$parentLogger) {
+			static::$parentLogger->reset();
+			static::$parentLogger = null;
+		}
 	}
 
 	public function getGPSR3Logger() {
-        return $this->logger;
-    }
+		return $this->logger;
+	}
 
 	/**
 	 * Returns a GLogger by name. If it does not exist, it will be created.

Braces +23 added lines, -14 removed lines

@@ -56,15 +56,18 @@ 
         // Load configuration from ini-file if a file path (string) is given
         if (is_string($configuration)) {
             $configuration = parse_ini_file($configuration);
-            if (!is_array($configuration))
-                throw new \Exception('Invalid GLogger configuration file');
-        } elseif (!is_array($configuration)) {
+            if (!is_array($configuration)) {
+                            throw new \Exception('Invalid GLogger configuration file');
+            }
+        }
+        elseif (!is_array($configuration)) {
             throw new \Exception('GLogger configuration should be either a string with path to the configuration file, or a configuration array');
         }
 
         // Log level
-        if (!isset($configuration['level']))
-            $configuration['level'] = 'INFO';
+        if (!isset($configuration['level'])) {
+                    $configuration['level'] = 'INFO';
+        }
         elseif (!is_string($configuration['level'])) {
             throw new \Exception('GLogger configuration parameter "level" is not a string');
         }
@@ -72,8 +75,9 @@ 
         $configuration['level'] = strtoupper($configuration['level']);
         $allLogLevels = Logger::getLevels();
 
-        if (!isset($allLogLevels[$configuration['level']]))
-            throw new \Exception('GLogger configuration parameter "level" is not known');
+        if (!isset($allLogLevels[$configuration['level']])) {
+                    throw new \Exception('GLogger configuration parameter "level" is not known');
+        }
 
         $logLevel = $allLogLevels[$configuration['level']];
 
@@ -82,11 +86,13 @@ 
 
         // Without configuration parameter 'file' all log messages will go to error_log()
         if (isset($configuration['file'])) {
-            if (!is_string($configuration['file']))
-                throw new \Exception('GLogger configuration parameter "file" is not a string');
+            if (!is_string($configuration['file'])) {
+                            throw new \Exception('GLogger configuration parameter "file" is not a string');
+            }
 
             $stream = new StreamHandler($configuration['file'], $logLevel);
-        } else {
+        }
+        else {
             $stream = new ErrorLogHandler(ErrorLogHandler::OPERATING_SYSTEM, $logLevel);
         }
 
@@ -94,14 +100,17 @@ 
         $lineFormat = null;
 
         if (isset($configuration['lineFormat'])
-            && is_string($configuration['lineFormat']))
-            $lineFormat = stripcslashes($configuration['lineFormat']); // stripcslashes to recognize "\n"
+            && is_string($configuration['lineFormat'])) {
+                    $lineFormat = stripcslashes($configuration['lineFormat']);
+        }
+        // stripcslashes to recognize "\n"
 
         $timeFormat = null;
 
         if (isset($configuration['timeFormat'])
-            && is_string($configuration['timeFormat']))
-            $timeFormat = $configuration['timeFormat'];
+            && is_string($configuration['timeFormat'])) {
+                    $timeFormat = $configuration['timeFormat'];
+        }
 
         if ($lineFormat
             || $timeFormat) {

lib/MonologWrapper.php

Indentation +15 added lines, -15 removed lines

@@ -9,20 +9,20 @@
 
 class MonologWrapper extends \Monolog\Logger {
 
-    /**
-     * Trace information
-     */
-    public const TRACE = 70;
+	/**
+	 * Trace information
+	 */
+	public const TRACE = 70;
 
-    protected static $levels = [
-        self::TRACE     => 'TRACE',
-        self::DEBUG     => 'DEBUG',
-        self::INFO      => 'INFO',
-        self::NOTICE    => 'NOTICE',
-        self::WARNING   => 'WARNING',
-        self::ERROR     => 'ERROR',
-        self::CRITICAL  => 'CRITICAL',
-        self::ALERT     => 'ALERT',
-        self::EMERGENCY => 'EMERGENCY',
-    ];
+	protected static $levels = [
+		self::TRACE     => 'TRACE',
+		self::DEBUG     => 'DEBUG',
+		self::INFO      => 'INFO',
+		self::NOTICE    => 'NOTICE',
+		self::WARNING   => 'WARNING',
+		self::ERROR     => 'ERROR',
+		self::CRITICAL  => 'CRITICAL',
+		self::ALERT     => 'ALERT',
+		self::EMERGENCY => 'EMERGENCY',
+	];
 }