Skip to content

Commit fe2b032

Browse files
arhimedearhimede
authored
Merge pull request #54 from dotkernel/issue-53
Issue #53: Replaced dot-twigrenderer with mezzio-twigrenderer
2 parents b6abe6f + 3beb9bd commit fe2b032

File tree

8 files changed

+42
-59
lines changed

8 files changed

+42
-59
lines changed

‎composer.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,21 @@
4343
}
4444
},
4545
"require": {
46-
"php": "~8.2.0 || ~8.3.0",
46+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
4747
"ext-sockets": "*",
4848
"clue/socket-raw": "^v1.6.0",
4949
"dotkernel/dot-cache": "^4.3",
5050
"dotkernel/dot-cli": "^3.9",
5151
"dotkernel/dot-data-fixtures": "^1.4.0",
5252
"dotkernel/dot-dependency-injection": "^1.2",
53-
"dotkernel/dot-log": "4.0.4",
53+
"dotkernel/dot-errorhandler": "4.2.1",
5454
"dotkernel/dot-mail": "^5.3.0",
55-
"dotkernel/dot-twigrenderer": "3.6.0",
55+
"laminas/laminas-authentication": "2.18.0",
5656
"laminas/laminas-component-installer": "^3.5",
5757
"laminas/laminas-config-aggregator": "^1.18",
5858
"mezzio/mezzio": "^3.20",
5959
"mezzio/mezzio-authentication-oauth2": "^2.11",
60+
"mezzio/mezzio-twigrenderer": "^2.17.0",
6061
"netglue/laminas-messenger": "^2.3.0",
6162
"ramsey/uuid": "^4.5.0",
6263
"ramsey/uuid-doctrine": "^2.1.0",

‎config/autoload/templates.global.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
declare(strict_types=1);
44

5-
use Dot\Twig\Extension\DateExtension;
6-
use Dot\Twig\Extension\TranslationExtension;
7-
use Laminas\ServiceManager\Factory\InvokableFactory;
85
use Mezzio\Template\TemplateRendererInterface;
96
use Mezzio\Twig\TwigEnvironmentFactory;
107
use Mezzio\Twig\TwigRendererFactory;
@@ -13,10 +10,8 @@
1310
return [
1411
'dependencies' => [
1512
'factories' => [
16-
DateExtension::class => InvokableFactory::class,
1713
Environment::class => TwigEnvironmentFactory::class,
1814
TemplateRendererInterface::class => TwigRendererFactory::class,
19-
TranslationExtension::class => InvokableFactory::class,
2015
],
2116
],
2217
'debug' => false,
@@ -29,10 +24,7 @@
2924
'auto_reload' => true,
3025
'autoescape' => 'html',
3126
'cache_dir' => 'data/cache/twig',
32-
'extensions' => [
33-
DateExtension::class,
34-
TranslationExtension::class,
35-
],
27+
'extensions' => [],
3628
'globals' => [
3729
'appName' => $app['name'] ?? '',
3830
],

‎config/config.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
Queue\Swoole\ConfigProvider::class,
2525

2626
// Dotkernel packages
27-
Dot\Log\ConfigProvider::class,
27+
Dot\Cache\ConfigProvider::class,
2828
Dot\Cli\ConfigProvider::class,
2929
Dot\DataFixtures\ConfigProvider::class,
3030
Dot\DependencyInjection\ConfigProvider::class,
31+
Dot\ErrorHandler\ConfigProvider::class,
32+
Dot\Log\ConfigProvider::class,
3133
Dot\Mail\ConfigProvider::class,
32-
Dot\Twig\ConfigProvider::class,
33-
Dot\Cache\ConfigProvider::class,
3434

3535
// Core modules
3636
Core\Admin\ConfigProvider::class,

‎src/App/Message/MessageHandler.php‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,16 @@ public function __invoke(Message $message): void
4646
try {
4747
$this->perform();
4848
} catch (Exception $exception) {
49-
$this->logger->err("message: " . $exception->getMessage());
49+
$this->logger->error("message: " . $exception->getMessage());
5050
}
5151
}
5252
}
5353

54-
/**
55-
* @throws MailException
56-
*/
5754
public function perform(): void
5855
{
5956
$this->sendWelcomeMail();
6057
}
6158

62-
/**
63-
* @throws MailException
64-
*/
6559
public function sendWelcomeMail(): bool
6660
{
6761
$user = $this->userRepository->find($this->args['userUuid']);

‎src/Core/src/App/src/InputFilter/AbstractInputFilter.php‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/Core/src/App/src/Service/MailService.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Core\App\Message;
88
use Core\User\Entity\User;
99
use Dot\DependencyInjection\Attribute\Inject;
10-
use Dot\Log\LoggerInterface;
10+
use Dot\Log\Logger;
1111
use Dot\Mail\Exception\MailException;
1212
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
1313

@@ -25,7 +25,7 @@ class MailService
2525
)]
2626
public function __construct(
2727
protected \Dot\Mail\Service\MailService $mailService,
28-
protected LoggerInterface $logger,
28+
protected Logger $logger,
2929
private readonly array $config,
3030
) {
3131
}
@@ -46,7 +46,7 @@ public function sendActivationMail(User $user, string $body): bool
4646
try {
4747
return $this->mailService->send()->isValid();
4848
} catch (MailException | TransportExceptionInterface $exception) {
49-
$this->logger->err($exception->getMessage());
49+
$this->logger->error($exception->getMessage());
5050
throw new MailException(sprintf(Message::MAIL_NOT_SENT_TO, $user->getEmail()));
5151
}
5252
}
@@ -65,7 +65,7 @@ public function sendResetPasswordRequestedMail(User $user, string $body): bool
6565
try {
6666
return $this->mailService->send()->isValid();
6767
} catch (MailException | TransportExceptionInterface $exception) {
68-
$this->logger->err($exception->getMessage());
68+
$this->logger->error($exception->getMessage());
6969
throw new MailException(sprintf(Message::MAIL_NOT_SENT_TO, $user->getEmail()));
7070
}
7171
}
@@ -84,7 +84,7 @@ public function sendResetPasswordCompletedMail(User $user, string $body): bool
8484
try {
8585
return $this->mailService->send()->isValid();
8686
} catch (MailException | TransportExceptionInterface $exception) {
87-
$this->logger->err($exception->getMessage());
87+
$this->logger->error($exception->getMessage());
8888
throw new MailException(sprintf(Message::MAIL_NOT_SENT_TO, $user->getEmail()));
8989
}
9090
}
@@ -103,7 +103,7 @@ public function sendRecoverIdentityMail(User $user, string $body): bool
103103
try {
104104
return $this->mailService->send()->isValid();
105105
} catch (MailException | TransportExceptionInterface $exception) {
106-
$this->logger->err($exception->getMessage());
106+
$this->logger->error($exception->getMessage());
107107
throw new MailException(sprintf(Message::MAIL_NOT_SENT_TO, $user->getEmail()));
108108
}
109109
}
@@ -120,7 +120,7 @@ public function sendWelcomeMail(User $user, string $body): bool
120120
try {
121121
return $this->mailService->send()->isValid();
122122
} catch (MailException | TransportExceptionInterface $exception) {
123-
$this->logger->err($exception->getMessage());
123+
$this->logger->error($exception->getMessage());
124124
throw new MailException(sprintf(Message::MAIL_NOT_SENT_TO, $user->getEmail()));
125125
}
126126
}

‎test/App/Message/ExampleMessageHandlerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public function setUp(): void
4141
$this->logger = new Logger([
4242
'writers' => [
4343
'FileWriter' => [
44-
'name' => 'null',
45-
'priority' => Logger::ALERT,
44+
'name' => 'null',
45+
'level' => Logger::ALERT,
4646
],
4747
],
4848
]);

‎test/Swoole/Delegators/TCPServerDelegatorTest.php‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
namespace QueueTest\Swoole\Delegators;
66

7-
use Dot\Log\LoggerInterface;
7+
use Dot\Log\Logger;
88
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
99
use PHPUnit\Framework\MockObject\Exception;
1010
use PHPUnit\Framework\TestCase;
11+
use Psr\Container\ContainerExceptionInterface;
1112
use Psr\Container\ContainerInterface;
1213
use Queue\Swoole\Delegators\TCPServerDelegator;
1314
use Swoole\Server;
@@ -16,22 +17,40 @@
1617

1718
class TCPServerDelegatorTest extends TestCase
1819
{
20+
protected Logger $logger;
21+
22+
/**
23+
* @throws ContainerExceptionInterface
24+
*/
25+
public function setUp(): void
26+
{
27+
parent::setUp();
28+
29+
$this->logger = new Logger([
30+
'writers' => [
31+
'FileWriter' => [
32+
'name' => 'null',
33+
'level' => Logger::ALERT,
34+
],
35+
],
36+
]);
37+
}
38+
1939
/**
2040
* @throws Exception
2141
*/
2242
#[RunInSeparateProcess]
2343
public function testInvokeRegistersAllCallbacks(): void
2444
{
25-
$logger = $this->createMock(LoggerInterface::class);
26-
$bus = $this->createMock(MessageBusInterface::class);
45+
$bus = $this->createMock(MessageBusInterface::class);
2746

2847
$server = new DummySwooleServer();
2948
$callback = fn (): Server => $server;
3049

3150
$container = $this->createMock(ContainerInterface::class);
3251
$container->method('get')->willReturnMap([
3352
[MessageBusInterface::class, $bus],
34-
['dot-log.queue-log', $logger],
53+
['dot-log.queue-log', $this->logger],
3554
]);
3655

3756
$delegator = new TCPServerDelegator();
@@ -61,21 +80,13 @@ public function testReceiveCallbackDispatchesMessagesAndLogs(): void
6180
return new Envelope($message);
6281
});
6382

64-
$logger = $this->createMock(LoggerInterface::class);
65-
$logger->expects($this->once())
66-
->method('notice')
67-
->with(
68-
$this->equalTo("Request received on receive"),
69-
$this->arrayHasKey('fd')
70-
);
71-
7283
$server = new DummySwooleServer();
7384
$callback = fn (): Server => $server;
7485

7586
$container = $this->createMock(ContainerInterface::class);
7687
$container->method('get')->willReturnMap([
7788
[MessageBusInterface::class, $bus],
78-
['dot-log.queue-log', $logger],
89+
['dot-log.queue-log', $this->logger],
7990
]);
8091

8192
$delegator = new TCPServerDelegator();

0 commit comments

Comments
 (0)