Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 03:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix logger classes and tests

Browse source
This commit is contained in:
Philipp 2023-07-17 01:06:11 +02:00
parent 903ecc2a76
commit bca6abf4ab
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
5 changed files with 28 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/src/Core/Hooks/Util/HookFileManagerTest.php
View file

@ -55,20 +55,12 @@ return [
\Psr\Log\NullLogger::class => [''],
],
],
\Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [
\Psr\Log\LoggerInterface::class => [
\Psr\Log\NullLogger::class,
],
],
];
EOF,
'addonsArray' => [],
'assertStrategies' => [
[LoggerInterface::class, NullLogger::class, ''],
],
'assertDecorators' => [
[LoggerInterface::class, NullLogger::class],
],
],
'normalWithString' => [
'content' => <<<EOF
@ -80,18 +72,12 @@ return [
\Psr\Log\NullLogger::class => '',
],
],
\Friendica\Core\Hooks\Capabilities\BehavioralHookType::DECORATOR => [
\Psr\Log\LoggerInterface::class => \Psr\Log\NullLogger::class,
],
];
EOF,
'addonsArray' => [],
'assertStrategies' => [
[LoggerInterface::class, NullLogger::class, ''],
],
'assertDecorators' => [
[LoggerInterface::class, NullLogger::class],
],
],
'withAddons' => [
'content' => <<<EOF
@ -116,7 +102,6 @@ EOF,
[LoggerInterface::class, NullLogger::class, ''],
[LoggerInterface::class, NullLogger::class, 'null'],
],
'assertDecorators' => [],
],
'withAddonsWithString' => [
'content' => <<<EOF
@ -141,7 +126,6 @@ EOF,
[LoggerInterface::class, NullLogger::class, ''],
[LoggerInterface::class, NullLogger::class, 'null'],
],
'assertDecorators' => [],
],
// This should work because unique name convention is part of the instance manager logic, not of the file-infrastructure layer
'withAddonsDoubleNamed' => [
@ -167,7 +151,6 @@ EOF,
[LoggerInterface::class, NullLogger::class, ''],
[LoggerInterface::class, NullLogger::class, ''],
],
'assertDecorators' => [],
],
'withWrongContentButAddons' => [
'content' => <<<EOF
@ -191,7 +174,6 @@ EOF,
'assertStrategies' => [
[LoggerInterface::class, NullLogger::class, ''],
],
'assertDecorators' => [],
],
];
}
@ -199,7 +181,7 @@ EOF,
/**
* @dataProvider dataHooks
*/
public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies, array $assertDecorators)
public function testSetupHooks(string $content, array $addonsArray, array $assertStrategies)
{
vfsStream::newFile('static/hooks.config.php')
->withContent($content)
@ -215,10 +197,6 @@ EOF,
$instanceManager->shouldReceive('registerStrategy')->withArgs($assertStrategy)->once();
}
foreach ($assertDecorators as $assertDecorator) {
$instanceManager->shouldReceive('registerDecorator')->withArgs($assertDecorator)->once();
}
$hookFileManager->setupHooks($instanceManager);
self::expectNotToPerformAssertions();