Merge pull request #11520 from annando/display-polls

[friendica.git] / src / Core / Logger.php

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index 6dde142cc953f3feae67ec1c39d1d882d009909d..2a62e5513f60424fb1d6dd38f24ec01d9b20a5b8 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,7 @@
 namespace Friendica\Core;
 
 use Friendica\DI;
-use Friendica\Util\Logger\WorkerLogger;
+use Friendica\Core\Logger\Type\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 
@@ -31,37 +31,6 @@ use Psr\Log\LogLevel;
  */
 class Logger
 {
-       /**
-        * @see Logger::error()
-        * @deprecated since 2019.01
-        */
-       const WARNING = LogLevel::ERROR;
-       /**
-        * @see Logger::warning()
-        * @deprecated since 2019.01
-        */
-       const INFO = LogLevel::WARNING;
-       /**
-        * @see Logger::notice()
-        * @deprecated since 2019.01
-        */
-       const TRACE = LogLevel::NOTICE;
-       /**
-        * @see Logger::info()
-        * @deprecated since 2019.01
-        */
-       const DEBUG = LogLevel::INFO;
-       /**
-        * @see Logger::debug()
-        * @deprecated since 2019.01
-        */
-       const DATA = LogLevel::DEBUG;
-       /**
-        * @see Logger::debug()
-        * @deprecated since 2019.01
-        */
-       const ALL = LogLevel::DEBUG;
-
        /**
         * @var LoggerInterface The default Logger type
         */
@@ -75,20 +44,6 @@ class Logger
         */
        private static $type = self::TYPE_LOGGER;
 
-       /**
-        * @var array the legacy loglevels
-        * @deprecated 2019.03 use PSR-3 loglevels
-        * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
-        *
-        */
-       public static $levels = [
-               self::WARNING => 'Warning',
-               self::INFO => 'Info',
-               self::TRACE => 'Trace',
-               self::DEBUG => 'Debug',
-               self::DATA => 'Data',
-       ];
-
        /**
         * @return LoggerInterface
         */
@@ -254,20 +209,6 @@ class Logger
                self::getWorker()->debug($message, $context);
        }
 
-       /**
-        * Logs the given message at the given log level
-        *
-        * @param string $msg
-        * @param string $level
-        *
-        * @throws \Exception
-        * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
-        */
-       public static function log($msg, $level = LogLevel::INFO)
-       {
-               self::getWorker()->log($level, $msg);
-       }
-
        /**
         * An alternative logger for development.
         *