diff --git a/composer.json b/composer.json index cde328c..f9b964d 100644 --- a/composer.json +++ b/composer.json @@ -43,21 +43,23 @@ } }, "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-authentication": "2.18.0", "laminas/laminas-component-installer": "^3.5", "laminas/laminas-config-aggregator": "^1.18", "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/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..b15dad6 100644 --- a/src/Core/src/App/src/InputFilter/AbstractInputFilter.php +++ b/src/Core/src/App/src/InputFilter/AbstractInputFilter.php @@ -4,12 +4,6 @@ namespace Core\App\InputFilter; -use Laminas\InputFilter\InputFilter; - -/** - * @template TFilteredValues - * @extends InputFilter - */ -abstract class AbstractInputFilter extends InputFilter +abstract class AbstractInputFilter { }