Friendica/friendica-github
1
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2025-02-07 07:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactor-logger-class-with-logger-object

Browse source
This commit is contained in:
Art4 2025-01-13 19:19:45 +00:00
commit 1a391fc9c3
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Core/Logger/Factory/LegacyLoggerFactory.php
View file

@ -15,7 +15,17 @@ use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
/** /**
* Manager for the core logging instances * Bridge for the legacy Logger factory.
*
* This class can be removed after the following classes are replaced or
* refactored implementing the `\Friendica\Core\Logger\Factory\LoggerFactory`:
*
* - Friendica\Core\Logger\Factory\StreamLogger
* - Friendica\Core\Logger\Factory\SyslogLogger
* - monolog addon: Friendica\Addon\monolog\src\Factory\Monolog
*
* @see \Friendica\Core\Logger\Factory\StreamLogger
* @see \Friendica\Core\Logger\Factory\SyslogLogger
*/ */
final class LegacyLoggerFactory implements LoggerFactory final class LegacyLoggerFactory implements LoggerFactory
{ {

35
tests/Unit/Core/Logger/LoggerManagerTest.php
View file

@ -21,12 +21,25 @@ use Psr\Log\NullLogger;
class LoggerManagerTest extends TestCase class LoggerManagerTest extends TestCase
{ {
public function testGetLoggerReturnsPsrLogger(): void /**
* Clean the private static properties
*
* @see LoggerManager::$logger
* @see LoggerManager::$logChannel
*/
protected function tearDown(): void
{ {
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger'); $reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true); $reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null); $reflectionProperty->setValue(null, null);
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logChannel');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, LogChannel::DEFAULT);
}
public function testGetLoggerReturnsPsrLogger(): void
{
$factory = new LoggerManager( $factory = new LoggerManager(
$this->createStub(IManageConfigValues::class), $this->createStub(IManageConfigValues::class),
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)
@ -37,10 +50,6 @@ class LoggerManagerTest extends TestCase
public function testGetLoggerReturnsSameObject(): void public function testGetLoggerReturnsSameObject(): void
{ {
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null);
$factory = new LoggerManager( $factory = new LoggerManager(
$this->createStub(IManageConfigValues::class), $this->createStub(IManageConfigValues::class),
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)
@ -56,10 +65,6 @@ class LoggerManagerTest extends TestCase
['system', 'debugging', null, false], ['system', 'debugging', null, false],
]); ]);
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null);
$factory = new LoggerManager( $factory = new LoggerManager(
$config, $config,
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)
@ -76,10 +81,6 @@ class LoggerManagerTest extends TestCase
['system', 'profiling', null, true], ['system', 'profiling', null, true],
]); ]);
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null);
$factory = new LoggerManager( $factory = new LoggerManager(
$config, $config,
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)
@ -96,10 +97,6 @@ class LoggerManagerTest extends TestCase
['system', 'profiling', null, true], ['system', 'profiling', null, true],
]); ]);
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null);
$factory = new LoggerManager( $factory = new LoggerManager(
$config, $config,
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)
@ -120,10 +117,6 @@ class LoggerManagerTest extends TestCase
['system', 'profiling', null, true], ['system', 'profiling', null, true],
]); ]);
$reflectionProperty = new \ReflectionProperty(LoggerManager::class, 'logger');
$reflectionProperty->setAccessible(true);
$reflectionProperty->setValue(null, null);
$factory = new LoggerManager( $factory = new LoggerManager(
$config, $config,
$this->createStub(LoggerFactory::class) $this->createStub(LoggerFactory::class)