Skip to content

Commit 014827c

Browse files
committed
Issue #53: Replaced dot-twigrenderer with mezzio-twigrenderer
Signed-off-by: bota <[email protected]>
1 parent b6abe6f commit 014827c

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
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",
5655
"laminas/laminas-component-installer": "^3.5",
5756
"laminas/laminas-config-aggregator": "^1.18",
57+
"laminas/laminas-diactoros": "^3.0",
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']);

0 commit comments

Comments
 (0)