From 04bef943b2dfe2baf5ca77938fd397f07ca88ee7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 3 Apr 2017 21:45:15 +0200 Subject: [PATCH] Fix root_path bugs --- Log/FileLogger.php | 4 ++-- UnhandledHandler.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Log/FileLogger.php b/Log/FileLogger.php index 50c3c9545..305ac1ba1 100644 --- a/Log/FileLogger.php +++ b/Log/FileLogger.php @@ -108,7 +108,7 @@ class FileLogger implements LoggerInterface $path = realpath($lpath); $this->verbose = $verbose; - if ($path !== false && StringUtils::startsWith($path, ROOT_PATH) === false) { + if ($path === false) { throw new PathException($lpath); } @@ -266,7 +266,7 @@ class FileLogger implements LoggerInterface $backtrace = json_encode($backtrace); - $replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\', ROOT_PATH), '', $backtrace); + $replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\'), '', $backtrace); $replace['{datetime}'] = sprintf('%--19s', (new \DateTime('NOW'))->format('Y-m-d H:i:s')); $replace['{level}'] = sprintf('%--12s', $level); $replace['{path}'] = $_SERVER['REQUEST_URI'] ?? 'REQUEST_URI'; diff --git a/UnhandledHandler.php b/UnhandledHandler.php index 9a4dddda9..c698d221a 100644 --- a/UnhandledHandler.php +++ b/UnhandledHandler.php @@ -41,7 +41,7 @@ final class UnhandledHandler */ public static function exceptionHandler($e) /* : void */ { - $logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); + $logger = FileLogger::getInstance(__DIR__ . '/../Logs'); $logger->critical(FileLogger::MSG_FULL, [ 'message' => $e->getMessage(), 'line' => $e->getLine(), @@ -74,7 +74,7 @@ final class UnhandledHandler return false; } - $logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); + $logger = FileLogger::getInstance(__DIR__ . '/../Logs'); $logger->error(FileLogger::MSG_FULL, [ 'message' => 'Unhandled error', 'line' => $errline, @@ -116,7 +116,7 @@ final class UnhandledHandler $e = error_get_last(); if (isset($e)) { - $logger = FileLogger::getInstance(ROOT_PATH . '/Logs'); + $logger = FileLogger::getInstance(__DIR__ . '/../Logs'); $logger->warning(FileLogger::MSG_FULL, [ 'message' => $e['message'], 'line' => $e['line'],