From 430557d2a58432b21f1275eb16c5581dbb97e972 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 3 Apr 2017 22:47:32 +0200 Subject: [PATCH] More ROOT_PATH fixes --- Log/FileLogger.php | 6 +----- Module/ActivateAbstract.php | 2 +- Module/DeactivateAbstract.php | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Log/FileLogger.php b/Log/FileLogger.php index 305ac1ba1..4634c1f0b 100644 --- a/Log/FileLogger.php +++ b/Log/FileLogger.php @@ -108,10 +108,6 @@ class FileLogger implements LoggerInterface $path = realpath($lpath); $this->verbose = $verbose; - if ($path === false) { - throw new PathException($lpath); - } - if (is_dir($lpath) || strpos($lpath, '.') === false) { $path = $path . '/' . date('Y-m-d') . '.log'; } else { @@ -266,7 +262,7 @@ class FileLogger implements LoggerInterface $backtrace = json_encode($backtrace); - $replace['{backtrace}'] = str_replace(str_replace('\\', '\\\\'), '', $backtrace); + $replace['{backtrace}'] = $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/Module/ActivateAbstract.php b/Module/ActivateAbstract.php index 1a7497526..59b2e5355 100644 --- a/Module/ActivateAbstract.php +++ b/Module/ActivateAbstract.php @@ -47,7 +47,7 @@ class ActivateAbstract */ public static function activate(DatabasePool $dbPool, InfoManager $info) /* : void */ { - self::activateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); + self::activateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::activateInDatabase($dbPool, $info); } diff --git a/Module/DeactivateAbstract.php b/Module/DeactivateAbstract.php index a8379543f..8d955ca62 100644 --- a/Module/DeactivateAbstract.php +++ b/Module/DeactivateAbstract.php @@ -47,7 +47,7 @@ class DeactivateAbstract */ public static function deactivate(DatabasePool $dbPool, InfoManager $info) /* : void */ { - self::deactivateRoutes(ROOT_PATH . '/Web/Routes.php', ROOT_PATH . '/Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); + self::deactivateRoutes(__DIR__ . '/../../Web/Routes.php', __DIR__ . '/../../Modules/' . $info->getDirectory() . '/Admin/Routes/http.php'); self::deactivateInDatabase($dbPool, $info); }