composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5809 Fix compilation error due to CASLogger VS LoggerInterface in psr/log

Browse Source 
"Declaration of Combodo\iTop\Cas\CASLogger::emergency($message, array $context = []) must be compatible with Psr\Log\LoggerInterface::emergency(Stringable|string $message, array $context = [])"

psr/log 3.0.0 brings the BC break
Switching to 2.0.0 is nice as it will bring improvements for PHP 8.0+ !
So adding psr/log ^2.0.0 to composer.json
This commit is contained in:
Pierre Goiffon
2024-01-26 10:27:45 +01:00
parent dfb5a4875a
commit ac44ffcdff
12 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/psr/log/src/LoggerAwareInterface.php
View File

@@ -14,5 +14,5 @@ interface LoggerAwareInterface
*
* @return void
*/
public function setLogger(LoggerInterface $logger): void;
public function setLogger(LoggerInterface $logger);
}

2
lib/psr/log/src/LoggerAwareTrait.php
View File

@@ -19,7 +19,7 @@ trait LoggerAwareTrait
*
* @param LoggerInterface $logger
*/
public function setLogger(LoggerInterface $logger): void
public function setLogger(LoggerInterface $logger)
{
$this->logger = $logger;
}

18
lib/psr/log/src/LoggerInterface.php
View File

@@ -27,7 +27,7 @@ interface LoggerInterface
*
* @return void
*/
public function emergency(string|\Stringable $message, array $context = []): void;
public function emergency(string|\Stringable $message, array $context = []);
/**
* Action must be taken immediately.
@@ -40,7 +40,7 @@ interface LoggerInterface
*
* @return void
*/
public function alert(string|\Stringable $message, array $context = []): void;
public function alert(string|\Stringable $message, array $context = []);
/**
* Critical conditions.
@@ -52,7 +52,7 @@ interface LoggerInterface
*
* @return void
*/
public function critical(string|\Stringable $message, array $context = []): void;
public function critical(string|\Stringable $message, array $context = []);
/**
* Runtime errors that do not require immediate action but should typically
@@ -63,7 +63,7 @@ interface LoggerInterface
*
* @return void
*/
public function error(string|\Stringable $message, array $context = []): void;
public function error(string|\Stringable $message, array $context = []);
/**
* Exceptional occurrences that are not errors.
@@ -76,7 +76,7 @@ interface LoggerInterface
*
* @return void
*/
public function warning(string|\Stringable $message, array $context = []): void;
public function warning(string|\Stringable $message, array $context = []);
/**
* Normal but significant events.
@@ -86,7 +86,7 @@ interface LoggerInterface
*
* @return void
*/
public function notice(string|\Stringable $message, array $context = []): void;
public function notice(string|\Stringable $message, array $context = []);
/**
* Interesting events.
@@ -98,7 +98,7 @@ interface LoggerInterface
*
* @return void
*/
public function info(string|\Stringable $message, array $context = []): void;
public function info(string|\Stringable $message, array $context = []);
/**
* Detailed debug information.
@@ -108,7 +108,7 @@ interface LoggerInterface
*
* @return void
*/
public function debug(string|\Stringable $message, array $context = []): void;
public function debug(string|\Stringable $message, array $context = []);
/**
* Logs with an arbitrary level.
@@ -121,5 +121,5 @@ interface LoggerInterface
*
* @throws \Psr\Log\InvalidArgumentException
*/
public function log($level, string|\Stringable $message, array $context = []): void;
public function log($level, string|\Stringable $message, array $context = []);
}

18
lib/psr/log/src/LoggerTrait.php
View File

@@ -20,7 +20,7 @@ trait LoggerTrait
*
* @return void
*/
public function emergency(string|\Stringable $message, array $context = []): void
public function emergency(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::EMERGENCY, $message, $context);
}
@@ -36,7 +36,7 @@ trait LoggerTrait
*
* @return void
*/
public function alert(string|\Stringable $message, array $context = []): void
public function alert(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::ALERT, $message, $context);
}
@@ -51,7 +51,7 @@ trait LoggerTrait
*
* @return void
*/
public function critical(string|\Stringable $message, array $context = []): void
public function critical(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::CRITICAL, $message, $context);
}
@@ -65,7 +65,7 @@ trait LoggerTrait
*
* @return void
*/
public function error(string|\Stringable $message, array $context = []): void
public function error(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::ERROR, $message, $context);
}
@@ -81,7 +81,7 @@ trait LoggerTrait
*
* @return void
*/
public function warning(string|\Stringable $message, array $context = []): void
public function warning(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::WARNING, $message, $context);
}
@@ -94,7 +94,7 @@ trait LoggerTrait
*
* @return void
*/
public function notice(string|\Stringable $message, array $context = []): void
public function notice(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::NOTICE, $message, $context);
}
@@ -109,7 +109,7 @@ trait LoggerTrait
*
* @return void
*/
public function info(string|\Stringable $message, array $context = []): void
public function info(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::INFO, $message, $context);
}
@@ -122,7 +122,7 @@ trait LoggerTrait
*
* @return void
*/
public function debug(string|\Stringable $message, array $context = []): void
public function debug(string|\Stringable $message, array $context = [])
{
$this->log(LogLevel::DEBUG, $message, $context);
}
@@ -138,5 +138,5 @@ trait LoggerTrait
*
* @throws \Psr\Log\InvalidArgumentException
*/
abstract public function log($level, string|\Stringable $message, array $context = []): void;
abstract public function log($level, string|\Stringable $message, array $context = []);
}

2
lib/psr/log/src/NullLogger.php
View File

@@ -23,7 +23,7 @@ class NullLogger extends AbstractLogger
*
* @throws \Psr\Log\InvalidArgumentException
*/
public function log($level, string|\Stringable $message, array $context = []): void
public function log($level, string|\Stringable $message, array $context = [])
{
// noop
}