From 1488d7fc3aa13a64f7b83f856cd53676422b4fcd Mon Sep 17 00:00:00 2001 From: sergiu Date: Tue, 8 Jul 2025 14:21:31 +0300 Subject: [PATCH 1/3] Issue #22:Replaced dot-twigrenderer with mezzio-twigrenderer Signed-off-by: sergiu --- composer.json | 8 +++++--- config/autoload/templates.global.php | 10 +--------- config/config.php | 1 - .../src/InputFilter/AbstractInputFilter.php | 18 +++++++++--------- 4 files changed, 15 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index cde328c..89e26c1 100644 --- a/composer.json +++ b/composer.json @@ -43,20 +43,22 @@ } }, "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0", "ext-sockets": "*", "clue/socket-raw": "^v1.6.0", "dotkernel/dot-cache": "^4.3", "dotkernel/dot-cli": "^3.9", "dotkernel/dot-data-fixtures": "^1.4.0", "dotkernel/dot-dependency-injection": "^1.2", - "dotkernel/dot-log": "4.0.4", + "dotkernel/dot-log": "4.1.0", "dotkernel/dot-mail": "^5.3.0", - "dotkernel/dot-twigrenderer": "3.6.0", "laminas/laminas-component-installer": "^3.5", "laminas/laminas-config-aggregator": "^1.18", + "psr-mock/http-message-implementation": "^1.0 || ^2.0", + "laminas/laminas-authentication": "2.18.0", "mezzio/mezzio": "^3.20", "mezzio/mezzio-authentication-oauth2": "^2.11", + "mezzio/mezzio-twigrenderer": "2.17.0", "netglue/laminas-messenger": "^2.3.0", "ramsey/uuid": "^4.5.0", "ramsey/uuid-doctrine": "^2.1.0", diff --git a/config/autoload/templates.global.php b/config/autoload/templates.global.php index 6b1f459..9ab96f2 100644 --- a/config/autoload/templates.global.php +++ b/config/autoload/templates.global.php @@ -2,9 +2,6 @@ declare(strict_types=1); -use Dot\Twig\Extension\DateExtension; -use Dot\Twig\Extension\TranslationExtension; -use Laminas\ServiceManager\Factory\InvokableFactory; use Mezzio\Template\TemplateRendererInterface; use Mezzio\Twig\TwigEnvironmentFactory; use Mezzio\Twig\TwigRendererFactory; @@ -13,10 +10,8 @@ return [ 'dependencies' => [ 'factories' => [ - DateExtension::class => InvokableFactory::class, Environment::class => TwigEnvironmentFactory::class, TemplateRendererInterface::class => TwigRendererFactory::class, - TranslationExtension::class => InvokableFactory::class, ], ], 'debug' => false, @@ -29,10 +24,7 @@ 'auto_reload' => true, 'autoescape' => 'html', 'cache_dir' => 'data/cache/twig', - 'extensions' => [ - DateExtension::class, - TranslationExtension::class, - ], + 'extensions' => [], 'globals' => [ 'appName' => $app['name'] ?? '', ], diff --git a/config/config.php b/config/config.php index 90cf75b..51f9790 100644 --- a/config/config.php +++ b/config/config.php @@ -29,7 +29,6 @@ Dot\DataFixtures\ConfigProvider::class, Dot\DependencyInjection\ConfigProvider::class, Dot\Mail\ConfigProvider::class, - Dot\Twig\ConfigProvider::class, Dot\Cache\ConfigProvider::class, // Core modules diff --git a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php index 23d7fcc..ff808aa 100644 --- a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php +++ b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php @@ -4,12 +4,12 @@ namespace Core\App\InputFilter; -use Laminas\InputFilter\InputFilter; - -/** - * @template TFilteredValues - * @extends InputFilter - */ -abstract class AbstractInputFilter extends InputFilter -{ -} +//use Laminas\InputFilter\InputFilter; +// +///** +// * @template TFilteredValues +// * @extends InputFilter +// */ +//abstract class AbstractInputFilter extends InputFilter +//{ +//} From aeca9513ebb7d06f471f30a5401f91e514c47bc6 Mon Sep 17 00:00:00 2001 From: sergiu Date: Tue, 8 Jul 2025 19:09:40 +0300 Subject: [PATCH 2/3] libraries sorded alphabetically Signed-off-by: sergiu --- composer.json | 4 ++-- .../App/src/InputFilter/AbstractInputFilter.php | 15 --------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 src/Core/src/App/src/InputFilter/AbstractInputFilter.php diff --git a/composer.json b/composer.json index 89e26c1..f9b964d 100644 --- a/composer.json +++ b/composer.json @@ -52,14 +52,14 @@ "dotkernel/dot-dependency-injection": "^1.2", "dotkernel/dot-log": "4.1.0", "dotkernel/dot-mail": "^5.3.0", + "laminas/laminas-authentication": "2.18.0", "laminas/laminas-component-installer": "^3.5", "laminas/laminas-config-aggregator": "^1.18", - "psr-mock/http-message-implementation": "^1.0 || ^2.0", - "laminas/laminas-authentication": "2.18.0", "mezzio/mezzio": "^3.20", "mezzio/mezzio-authentication-oauth2": "^2.11", "mezzio/mezzio-twigrenderer": "2.17.0", "netglue/laminas-messenger": "^2.3.0", + "psr-mock/http-message-implementation": "^1.0 || ^2.0", "ramsey/uuid": "^4.5.0", "ramsey/uuid-doctrine": "^2.1.0", "roave/psr-container-doctrine": "^5.2.2", diff --git a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php deleted file mode 100644 index ff808aa..0000000 --- a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php +++ /dev/null @@ -1,15 +0,0 @@ - -// */ -//abstract class AbstractInputFilter extends InputFilter -//{ -//} From 20ec9deeba710f6343fb47375c53964d9ea01874 Mon Sep 17 00:00:00 2001 From: sergiu Date: Tue, 8 Jul 2025 19:47:17 +0300 Subject: [PATCH 3/3] undo removig core file Signed-off-by: sergiu --- src/Core/src/App/src/InputFilter/AbstractInputFilter.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/Core/src/App/src/InputFilter/AbstractInputFilter.php diff --git a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php new file mode 100644 index 0000000..b15dad6 --- /dev/null +++ b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php @@ -0,0 +1,9 @@ +