Merge pull request #366 from dotkernel/issue-365

Issue #365: Removed `laminas/laminas-i18n`

Author: arhimede

composer.json

@@ -28,7 +28,6 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0",
-        "ext-gettext": "*",
         "dotkernel/dot-cache": "^4.3.0",
         "dotkernel/dot-cli": "^3.9.0",
         "dotkernel/dot-data-fixtures": "^1.4.0",
@@ -46,28 +45,26 @@
         "friendsofphp/proxy-manager-lts": "^1.0.18",
         "laminas/laminas-component-installer": "^3.5.0",
         "laminas/laminas-config-aggregator": "^1.18.0",
-        "laminas/laminas-i18n": "^2.29.0",
-        "laminas/laminas-math": "^3.8.1",
-        "mezzio/mezzio": "^3.20.1",
+        "mezzio/mezzio": "^3.21.0",
         "mezzio/mezzio-authentication-oauth2": "^2.11.0",
-        "mezzio/mezzio-authorization-rbac": "^1.8.0",
-        "mezzio/mezzio-cors": "^1.13.0",
-        "mezzio/mezzio-fastroute": "^3.12.0",
+        "mezzio/mezzio-authorization-rbac": "^1.9.0",
+        "mezzio/mezzio-cors": "^1.14.0",
+        "mezzio/mezzio-fastroute": "^3.13.0",
         "ramsey/uuid-doctrine": "^2.1.0",
         "roave/psr-container-doctrine": "^5.2.2"
     },
     "require-dev": {
         "filp/whoops": "^2.18.0",
-        "laminas/laminas-coding-standard": "^3.0.1",
+        "laminas/laminas-coding-standard": "^3.1.0",
         "laminas/laminas-development-mode": "^3.13.0",
         "mezzio/mezzio-tooling": "^2.10.1",
-        "phpunit/phpunit": "^10.5.45",
-        "roave/security-advisories": "dev-latest",
-        "vincentlanglet/twig-cs-fixer": "^3.5.1",
-        "phpstan/phpstan": "^2.1.11",
-        "phpstan/phpstan-doctrine": "^2.0.2",
+        "phpstan/phpstan": "^2.1.17",
+        "phpstan/phpstan-doctrine": "^2.0.3",
         "phpstan/phpstan-phpunit": "^2.0.6",
-        "symfony/var-dumper": "^7.2.3"
+        "phpunit/phpunit": "^10.5.46",
+        "roave/security-advisories": "dev-latest",
+        "symfony/var-dumper": "^7.3.0",
+        "vincentlanglet/twig-cs-fixer": "^3.7.1"
     },
     "autoload": {
         "psr-4": {

config/config.php

@@ -8,6 +8,19 @@
     'config_cache_path' => 'data/cache/config-cache.php',
 ];
 
+/**
+ * @see https://github.com/dotkernel/admin/issues/365
+ */
+if (! class_exists('\Laminas\I18n\View\Helper\AbstractTranslatorHelper')) {
+    class_alias(
+        Admin\App\Laminas\I18n\View\Helper\AbstractTranslatorHelper::class,
+        '\Laminas\I18n\View\Helper\AbstractTranslatorHelper'
+    );
+}
+if (! class_exists('\Laminas\I18n\Validator\IsFloat')) {
+    class_alias(Admin\App\Laminas\I18n\Validator\IsFloat::class, '\Laminas\I18n\Validator\IsFloat');
+}
+
 // @codingStandardsIgnoreStart
 $aggregator = new Laminas\ConfigAggregator\ConfigAggregator([
     // Laminas packages

src/Admin/src/Handler/Account/PostAccountLoginHandler.php

@@ -24,6 +24,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
 
+use function assert;
+
 class PostAccountLoginHandler implements RequestHandlerInterface
 {
     #[Inject(
@@ -40,7 +42,7 @@ public function __construct(
         protected AdminServiceInterface $adminService,
         protected AdminLoginServiceInterface $adminLoginService,
         protected RouterInterface $router,
-        protected LaminasAuthenticationServiceInterface&AuthenticationServiceInterface $authenticationService,
+        protected LaminasAuthenticationServiceInterface $authenticationService,
         protected FlashMessengerInterface $messenger,
         protected FormsPlugin $forms,
         protected LoginForm $loginForm,
@@ -50,6 +52,7 @@ public function __construct(
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
+        assert($this->authenticationService instanceof AuthenticationServiceInterface);
         if ($this->authenticationService->hasIdentity()) {
             return new RedirectResponse($this->router->generateUri('app::index-redirect'));
         }

src/App/src/Laminas/I18n/Validator/IsFloat.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Admin\App\Laminas\I18n\Validator;
+
+use Laminas\Validator\AbstractValidator;
+
+class IsFloat extends AbstractValidator
+{
+    /**
+     * @inheritDoc
+     */
+    public function isValid($value): false
+    {
+        return false;
+    }
+}

src/App/src/Laminas/I18n/View/Helper/AbstractTranslatorHelper.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Admin\App\Laminas\I18n\View\Helper;
+
+use Laminas\View\Helper\AbstractHelper;
+
+abstract class AbstractTranslatorHelper extends AbstractHelper
+{
+    public function getTranslator(): null
+    {
+        return null;
+    }
+}

src/User/src/Handler/PostUserAvatarEditHandler.php

@@ -5,11 +5,15 @@
 namespace Admin\User\Handler;
 
 use Admin\App\Exception\NotFoundException;
+use Admin\App\Form\AbstractForm;
 use Admin\User\Form\EditUserAvatarForm;
 use Admin\User\Form\EditUserForm;
 use Admin\User\Service\UserAvatarServiceInterface;
+use Admin\User\Service\UserRoleServiceInterface;
 use Admin\User\Service\UserServiceInterface;
 use Core\App\Message;
+use Core\User\Entity\UserRole;
+use Core\User\Enum\UserRoleEnum;
 use Dot\DependencyInjection\Attribute\Inject;
 use Dot\FlashMessenger\FlashMessengerInterface;
 use Dot\Log\Logger;
@@ -23,12 +27,18 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
 
+use function array_filter;
+use function array_map;
 use function array_merge;
 
+/**
+ * @phpstan-import-type SelectDataType from AbstractForm
+ */
 class PostUserAvatarEditHandler implements RequestHandlerInterface
 {
     #[Inject(
         UserServiceInterface::class,
+        UserRoleServiceInterface::class,
         UserAvatarServiceInterface::class,
         RouterInterface::class,
         TemplateRendererInterface::class,
@@ -39,6 +49,7 @@ class PostUserAvatarEditHandler implements RequestHandlerInterface
     )]
     public function __construct(
         protected UserServiceInterface $userService,
+        protected UserRoleServiceInterface $userRoleService,
         protected UserAvatarServiceInterface $userAvatarService,
         protected RouterInterface $router,
         protected TemplateRendererInterface $template,
@@ -59,6 +70,19 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             return new EmptyResponse(StatusCodeInterface::STATUS_NOT_FOUND);
         }
 
+        /** @var UserRole[] $userRoles */
+        $userRoles = $this->userRoleService->getUserRoleRepository()->findAll();
+        $userRoles = array_map(
+        /** @return SelectDataType */
+            fn (UserRole $userRole): array => [
+                'label'    => $userRole->getName()->value,
+                'value'    => $userRole->getUuid()->toString(),
+                'selected' => $user->hasRole($userRole),
+            ],
+            $userRoles
+        );
+        $userRoles = array_filter($userRoles, fn (array $role) => $role['label'] !== UserRoleEnum::Guest->value);
+
         $this->editUserAvatarForm
             ->setAttribute(
                 'action',
@@ -69,7 +93,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ->setAttribute(
                 'action',
                 $this->router->generateUri('user::user-edit', ['uuid' => $user->getUuid()->toString()])
-            );
+            )
+            ->setRoles($userRoles);
 
         try {
             $this->editUserAvatarForm->setData(

test/Unit/Admin/Adapter/AuthenticationAdapterTest.php

@@ -100,7 +100,6 @@ public function testWillNotAuthenticateWithoutValidConfig(): void
     /**
      * @throws MockObjectException
      * @throws ORMException
-     * @group testing
      */
     public function testWillNotAuthenticateWithInvalidIdentityClassConfig(): void
     {