alexmerlin · Oct 19, 2026 · Oct 19, 2026
diff --git a/composer.json b/composer.json
@@ -52,47 +52,48 @@
         "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-gd": "*",
         "ext-json": "*",
-        "dotkernel/dot-cache": "^4.3",
-        "dotkernel/dot-cli": "^3.9.0",
-        "dotkernel/dot-data-fixtures": "^1.4.0",
-        "dotkernel/dot-dependency-injection": "^1.2",
-        "dotkernel/dot-errorhandler": "^4.0.0",
-        "dotkernel/dot-mail": "^5.3.0",
-        "dotkernel/dot-response-header": "^3.5.0",
-        "dotkernel/dot-router": "^1.0.5",
-        "laminas/laminas-authentication": "^2.18",
-        "laminas/laminas-component-installer": "^3.5.0",
-        "laminas/laminas-config-aggregator": "^1.18.0",
-        "laminas/laminas-hydrator": "^4.16.0",
-        "laminas/laminas-inputfilter": "^2.31.0",
-        "laminas/laminas-stdlib": "^3.20.0",
-        "mezzio/mezzio": "^3.20.1",
-        "mezzio/mezzio-authentication-oauth2": "^3.0.1",
-        "mezzio/mezzio-authorization-acl": "^1.11.0",
-        "mezzio/mezzio-authorization-rbac": "^1.8.0",
-        "mezzio/mezzio-cors": "^1.13.0",
-        "mezzio/mezzio-fastroute": "^3.12.0",
-        "mezzio/mezzio-hal": "^2.10.1",
-        "mezzio/mezzio-helpers": "^5.18",
-        "mezzio/mezzio-problem-details": "^1.15.0",
-        "ramsey/uuid": "^4.5.0",
+        "dotkernel/dot-cache": "^4.4",
+        "dotkernel/dot-cli": "^3.11.1",
+        "dotkernel/dot-data-fixtures": "^1.5.0",
+        "dotkernel/dot-dependency-injection": "^1.4.1",
+        "dotkernel/dot-errorhandler": "^5.0.0",
+        "dotkernel/dot-mail": "^5.4.3",
+        "dotkernel/dot-response-header": "^3.6.0",
+        "dotkernel/dot-router": "^1.1.0",
+        "laminas/laminas-authentication": "^2.19",
+        "laminas/laminas-component-installer": "^3.8.0",
+        "laminas/laminas-config-aggregator": "^1.20.0",
+        "laminas/laminas-hydrator": "^5.0.0",
+        "laminas/laminas-inputfilter": "^3.0.x-dev",
+        "laminas/laminas-servicemanager": "^4.5.1",
+        "laminas/laminas-stdlib": "^3.21.0",
+        "mezzio/mezzio": "^3.28.1",
+        "mezzio/mezzio-authentication-oauth2": "^3.1.0",
+        "mezzio/mezzio-authorization-acl": "^1.13.0",
+        "mezzio/mezzio-authorization-rbac": "^1.10.0",
+        "mezzio/mezzio-cors": "^1.16.0",
+        "mezzio/mezzio-fastroute": "^3.14.0",
+        "mezzio/mezzio-hal": "^2.13.0",
+        "mezzio/mezzio-helpers": "^5.20",
+        "mezzio/mezzio-problem-details": "^1.19.0",
+        "ramsey/uuid": "^4.9.4",
         "ramsey/uuid-doctrine": "^2.1.0",
-        "roave/psr-container-doctrine": "^5.2.2 || ^6.0.0",
-        "symfony/filesystem": "^7.2.0",
-        "symfony/var-exporter": "^6.4 || ^7.4",
-        "zircote/swagger-php": "^6.4.0"
+        "roave/psr-container-doctrine": "^5.2.2 || ^6.2.0",
+        "symfony/filesystem": "^7.4.21",
+        "symfony/var-exporter": "^6.4 || ^7.4.18",
+        "zircote/swagger-php": "^6.17.0"
     },
     "require-dev": {
-        "boundwize/structarmed": "^0.19.0",
-        "dotkernel/dot-maker": "^2.0.0",
-        "laminas/laminas-coding-standard": "^3.0.1",
-        "laminas/laminas-development-mode": "^3.13.0",
-        "phpstan/phpstan": "^2.1.11",
-        "phpstan/phpstan-doctrine": "^2.0.2",
-        "phpstan/phpstan-phpunit": "^2.0.6",
-        "phpunit/phpunit": "^12.5.23",
+        "boundwize/structarmed": "^0.19.5",
+        "dotkernel/dot-maker": "^2.1.0",
+        "laminas/laminas-coding-standard": "^3.1.0",
+        "laminas/laminas-development-mode": "^3.15.0",
+        "phpstan/phpstan": "^2.3.1",
+        "phpstan/phpstan-doctrine": "^2.0.28",
+        "phpstan/phpstan-phpunit": "^2.1.1",
+        "phpunit/phpunit": "^12.5.40",
         "roave/security-advisories": "dev-latest",
-        "symfony/var-dumper": "^7.2.3"
+        "symfony/var-dumper": "^7.4.21"
     },
     "autoload": {
         "psr-4": {

diff --git a/config/autoload/error-handling.global.php b/config/autoload/error-handling.global.php
@@ -3,29 +3,59 @@
 declare(strict_types=1);
 
 use Api\App\Service\ErrorReportServiceInterface;
+use Dot\ErrorHandler\Extra\ExtraProvider;
+use Dot\ErrorHandler\Extra\Processor\RequestProcessor;
+use Dot\ErrorHandler\Extra\Processor\TraceProcessor;
+use Dot\ErrorHandler\Extra\Provider\RequestProvider;
+use Dot\ErrorHandler\Extra\Provider\TraceProvider;
+use Dot\ErrorHandler\Extra\ReplacementStrategy;
 use Dot\Log\Formatter\Json;
 use Dot\Log\Logger;
 
 return [
     'dot-errorhandler' => [
-        'loggerEnabled' => true,
-        'logger'        => 'dot-log.default_logger',
+        'loggerEnabled'           => true,
+        'logger'                  => 'dot-log.default_logger',
+        ExtraProvider::CONFIG_KEY => [
+            TraceProvider::class => [
+                'enabled'   => true,
+                'processor' => [
+                    'class' => TraceProcessor::class,
+                ],
+            ],
+            /**
+             * Logs the parsed request body. Keys containing any of the sensitiveParameters are masked,
+             * but other personal data (emails, names etc.) is logged as-is.
+             */
+            RequestProvider::class => [
+                'enabled'   => false,
+                'processor' => [
+                    'class'               => RequestProcessor::class,
+                    'replacementStrategy' => ReplacementStrategy::Full,
+                    'sensitiveParameters' => [
+                        'password',
+                        'token',
+                        'secret',
+                    ],
+                ],
+            ],
+        ],
     ],
     'dot_log'          => [
         'loggers' => [
             'default_logger' => [
                 'writers' => [
                     'FileWriter' => [
-                        'name'     => 'stream',
-                        'priority' => Logger::ALERT,
-                        'options'  => [
+                        'name'    => 'stream',
+                        'level'   => Logger::ALERT,
+                        'options' => [
                             'stream'    => __DIR__ . '/../../log/error-log-{Y}-{m}-{d}.log',
                             'filters'   => [
                                 'allMessages' => [
-                                    'name'    => 'priority',
+                                    'name'    => 'level',
                                     'options' => [
                                         'operator' => '>=',
-                                        'priority' => Logger::EMERG,
+                                        'level'    => Logger::EMERG,
                                     ],
                                 ],
                             ],

diff --git a/config/cli-config.php b/config/cli-config.php
@@ -9,8 +9,8 @@
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Events;
-use Dot\Log\LoggerInterface;
 use Psr\Container\ContainerExceptionInterface;
+use Psr\Log\LoggerInterface;
 
 $container = require 'config/container.php';
 
@@ -29,7 +29,7 @@
     try {
         /** @var LoggerInterface $logger */
         $logger = $container->get('dot-log.default_logger');
-        $logger->err($exception->getMessage());
+        $logger->error($exception->getMessage());
     } catch (ContainerExceptionInterface $exception) {
         error_log($exception->getMessage());
     }

diff --git a/src/Admin/src/Command/AdminCreateCommand.php b/src/Admin/src/Command/AdminCreateCommand.php
@@ -13,6 +13,7 @@
 use Core\Admin\Entity\AdminRole;
 use Core\Admin\Enum\AdminRoleEnum;
 use Core\Admin\Enum\AdminStatusEnum;
+use Core\App\InputFilter\ValidationErrors;
 use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Exception;
@@ -41,10 +42,12 @@ class AdminCreateCommand extends Command
     #[Inject(
         AdminServiceInterface::class,
         AdminRoleServiceInterface::class,
+        CreateAdminInputFilter::class,
     )]
     public function __construct(
         protected AdminServiceInterface $adminService,
         protected AdminRoleServiceInterface $adminRoleService,
+        protected CreateAdminInputFilter $inputFilter,
     ) {
         parent::__construct(self::$defaultName);
     }
@@ -71,10 +74,10 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $inputFilter = (new CreateAdminInputFilter())->setData($this->getData($input));
-        if (! $inputFilter->isValid()) {
+        $result = $this->inputFilter->validate($this->getData($input));
+        if (! $result->valid()) {
             $messages = [];
-            foreach ($inputFilter->getMessages() as $field => $errors) {
+            foreach (ValidationErrors::fromResult($result) as $field => $errors) {
                 foreach ($errors as $error) {
                     /** @var scalar $error */
                     $messages[] = sprintf('%s: %s', $field, $error);
@@ -84,7 +87,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             throw new Exception(implode(PHP_EOL, $messages));
         }
 
-        $this->adminService->saveAdmin($inputFilter->getValues());
+        /** @var non-empty-array<non-empty-string, mixed> $data */
+        $data = $result->value();
+
+        $this->adminService->saveAdmin($data);
 
         (new SymfonyStyle($input, $output))->info(Message::ADMIN_CREATED);
 

diff --git a/src/Admin/src/ConfigProvider.php b/src/Admin/src/ConfigProvider.php
@@ -16,6 +16,8 @@
 use Api\Admin\Handler\Admin\PostAdminResourceHandler;
 use Api\Admin\Handler\Admin\Role\GetAdminRoleCollectionHandler;
 use Api\Admin\Handler\Admin\Role\GetAdminRoleResourceHandler;
+use Api\Admin\InputFilter\CreateAdminInputFilter;
+use Api\Admin\InputFilter\UpdateAdminInputFilter;
 use Api\Admin\Service\AdminRoleService;
 use Api\Admin\Service\AdminRoleServiceInterface;
 use Api\Admin\Service\AdminService;
@@ -25,6 +27,7 @@
 use Core\Admin\Entity\Admin;
 use Core\Admin\Entity\AdminRole;
 use Dot\DependencyInjection\Factory\AttributedServiceFactory;
+use Laminas\InputFilter\InputFilterFactory;
 use Mezzio\Application;
 use Mezzio\Hal\Metadata\MetadataMap;
 
@@ -71,6 +74,8 @@ private function getDependencies(): array
                 PostAdminResourceHandler::class         => [HandlerDelegatorFactory::class],
             ],
             'factories'  => [
+                CreateAdminInputFilter::class           => InputFilterFactory::class,
+                UpdateAdminInputFilter::class           => InputFilterFactory::class,
                 AdminCreateCommand::class               => AttributedServiceFactory::class,
                 DeleteAdminResourceHandler::class       => AttributedServiceFactory::class,
                 GetAdminAccountResourceHandler::class   => AttributedServiceFactory::class,

diff --git a/src/Admin/src/Handler/Account/PatchAdminAccountResourceHandler.php b/src/Admin/src/Handler/Account/PatchAdminAccountResourceHandler.php
@@ -11,7 +11,6 @@
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\AbstractHandler;
 use Api\App\IdentityInterface;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -35,16 +34,13 @@ public function __construct(
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->inputFilter->setData((array) $request->getParsedBody());
-        if (! $this->inputFilter->isValid()) {
-            throw BadRequestException::create(
-                detail: Message::VALIDATOR_INVALID_DATA,
-                additional: ['errors' => $this->inputFilter->getMessages()]
-            );
+        $result = $this->inputFilter->validate((array) $request->getParsedBody());
+        if (! $result->valid()) {
+            throw BadRequestException::fromValidationResult($result);
         }
 
         /** @var non-empty-array<non-empty-string, mixed> $data */
-        $data = (array) $this->inputFilter->getValues();
+        $data = $result->value();
 
         return $this->createResponse(
             $request,

diff --git a/src/Admin/src/Handler/Admin/PatchAdminResourceHandler.php b/src/Admin/src/Handler/Admin/PatchAdminResourceHandler.php
@@ -12,7 +12,6 @@
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\AbstractHandler;
 use Core\Admin\Entity\Admin;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -37,16 +36,13 @@ public function __construct(
     #[Resource(entity: Admin::class)]
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->inputFilter->setData((array) $request->getParsedBody());
-        if (! $this->inputFilter->isValid()) {
-            throw BadRequestException::create(
-                detail: Message::VALIDATOR_INVALID_DATA,
-                additional: ['errors' => $this->inputFilter->getMessages()]
-            );
+        $result = $this->inputFilter->validate((array) $request->getParsedBody());
+        if (! $result->valid()) {
+            throw BadRequestException::fromValidationResult($result);
         }
 
         /** @var non-empty-array<non-empty-string, mixed> $data */
-        $data = (array) $this->inputFilter->getValues();
+        $data = $result->value();
 
         return $this->createResponse(
             $request,

diff --git a/src/Admin/src/Handler/Admin/PostAdminResourceHandler.php b/src/Admin/src/Handler/Admin/PostAdminResourceHandler.php
@@ -10,7 +10,6 @@
 use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\AbstractHandler;
-use Core\App\Message;
 use Dot\DependencyInjection\Attribute\Inject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -34,16 +33,13 @@ public function __construct(
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->inputFilter->setData((array) $request->getParsedBody());
-        if (! $this->inputFilter->isValid()) {
-            throw BadRequestException::create(
-                detail: Message::VALIDATOR_INVALID_DATA,
-                additional: ['errors' => $this->inputFilter->getMessages()]
-            );
+        $result = $this->inputFilter->validate((array) $request->getParsedBody());
+        if (! $result->valid()) {
+            throw BadRequestException::fromValidationResult($result);
         }
 
         /** @var non-empty-array<non-empty-string, mixed> $data */
-        $data = (array) $this->inputFilter->getValues();
+        $data = $result->value();
 
         return $this->createdResponse($request, $this->adminService->saveAdmin($data));
     }

diff --git a/src/Admin/src/InputFilter/AdminRoleInputFilter.php b/src/Admin/src/InputFilter/AdminRoleInputFilter.php
@@ -6,6 +6,7 @@
 
 use Api\App\InputFilter\Input\UuidInput;
 use Core\App\InputFilter\AbstractInputFilter;
+use Laminas\InputFilter\Factory;
 
 /**
  * @phpstan-type AdminRoleDataType array{
@@ -15,8 +16,10 @@
  */
 class AdminRoleInputFilter extends AbstractInputFilter
 {
-    public function __construct()
+    public function __construct(Factory $factory)
     {
-        $this->add(new UuidInput('id'));
+        parent::__construct($factory);
+
+        $this->add(UuidInput::spec('id'));
     }
 }
diff --git a/src/Admin/src/InputFilter/CreateAdminInputFilter.php b/src/Admin/src/InputFilter/CreateAdminInputFilter.php
@@ -12,6 +12,7 @@
 use Api\App\InputFilter\Input\PasswordInput;
 use Core\App\InputFilter\AbstractInputFilter;
 use Laminas\InputFilter\CollectionInputFilter;
+use Laminas\InputFilter\Factory;
 
 /**
  * @phpstan-import-type AdminRoleDataType from AdminRoleInputFilter
@@ -28,19 +29,23 @@
  */
 class CreateAdminInputFilter extends AbstractInputFilter
 {
-    public function __construct()
+    public function __construct(Factory $factory)
     {
-        $roles = (new CollectionInputFilter())
-            ->setInputFilter(new AdminRoleInputFilter())
-            ->setIsRequired(true);
+        parent::__construct($factory);
+
+        $roles = [
+            'type'         => CollectionInputFilter::class,
+            'input_filter' => new AdminRoleInputFilter($factory),
+            'required'     => true,
+        ];
 
         $this
-            ->add(new IdentityInput('identity'))
-            ->add(new PasswordInput('password'))
-            ->add(new PasswordConfirmInput('passwordConfirm'))
-            ->add(new FirstNameInput('firstName', false))
-            ->add(new LastNameInput('lastName', false))
-            ->add(new StatusInput('status'))
+            ->add(IdentityInput::spec('identity'))
+            ->add(PasswordInput::spec('password'))
+            ->add(PasswordConfirmInput::spec('passwordConfirm'))
+            ->add(FirstNameInput::spec('firstName', false))
+            ->add(LastNameInput::spec('lastName', false))
+            ->add(StatusInput::spec('status'))
             ->add($roles, 'roles');
     }
 }