Issue #361: Increase PHPStan level to 8

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

phpstan.neon

@@ -2,7 +2,7 @@ includes:
     - vendor/phpstan/phpstan-doctrine/extension.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
 parameters:
-    level: 7
+    level: 8
     paths:
         - bin
         - config

src/Admin/src/Adapter/AuthenticationAdapter.php

@@ -146,7 +146,7 @@ public function authenticate(): Result
 
         $adminIdentity = new AdminIdentity(
             $identityClass->getUuid()->toString(),
-            $identityClass->getIdentity(),
+            (string) $identityClass->getIdentity(),
             $identityClass->getStatus(),
             $roles,
             [

src/Admin/src/Service/AdminService.php

@@ -127,7 +127,7 @@ public function saveAdmin(array $data, ?Admin $admin = null): Admin
             $admin->setStatus($status);
         }
 
-        $this->validateUniqueAdmin($admin->getIdentity(), $admin->getUuid());
+        $this->validateUniqueAdmin((string) $admin->getIdentity(), $admin->getUuid());
 
         if (array_key_exists('roles', $data) && count($data['roles']) > 0) {
             $admin->resetRoles();

src/Core/src/User/src/Entity/User.php

@@ -290,6 +290,11 @@ public function getEmail(): string
         return trim((string) $this->getDetail()->getEmail());
     }
 
+    public function hasEmail(): bool
+    {
+        return $this->getEmail() !== '';
+    }
+
     public function getName(): string
     {
         if (! $this->getDetail() instanceof UserDetail) {

src/User/src/Handler/PostUserCreateHandler.php

@@ -70,7 +70,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $data = $this->createUserForm->getData();
                 $user = $this->userService->saveUser($data);
                 $this->messenger->addSuccess(Message::USER_CREATED);
-                if ($user->getDetail()->hasEmail()) {
+                if ($user->hasEmail()) {
                     $body = $this->template->render('user::welcome', [
                         'config' => $this->config,
                         'user'   => $user,
@@ -94,7 +94,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 'line'  => $exception->getLine(),
                 'trace' => $exception->getTraceAsString(),
             ]);
-            $this->messenger->addError(Message::mailNotSentTo($user->getDetail()->getEmail()));
+            $this->messenger->addError(Message::mailNotSentTo($user->getEmail()));
             return new EmptyResponse(StatusCodeInterface::STATUS_CREATED);
         } catch (BadRequestException | ConflictException | NotFoundException $exception) {
             return new HtmlResponse(

src/User/src/Service/UserService.php

@@ -24,6 +24,7 @@
 use Ramsey\Uuid\UuidInterface;
 
 use function array_key_exists;
+use function assert;
 use function count;
 use function date;
 use function in_array;
@@ -91,6 +92,9 @@ public function findByEmail(string $email): User
         }
 
         $user = $userDetail->getUser();
+        if (! $user instanceof User) {
+            throw new NotFoundException(Message::USER_NOT_FOUND);
+        }
         if ($user->isDeleted()) {
             throw new NotFoundException(Message::USER_NOT_FOUND);
         }
@@ -183,6 +187,7 @@ public function saveUser(array $data, ?User $user = null): User
             if (! $user->hasDetail()) {
                 $user->setDetail((new UserDetail())->setUser($user));
             }
+            assert($user->getDetail() instanceof UserDetail);
             if (array_key_exists('firstName', $data['detail']) && $data['detail']['firstName'] !== null) {
                 $user->getDetail()->setFirstname($data['detail']['firstName']);
             }
@@ -194,7 +199,7 @@ public function saveUser(array $data, ?User $user = null): User
             }
         }
 
-        $this->validateUniqueUser($user->getIdentity(), $user->getDetail()->getEmail(), $user->getUuid());
+        $this->validateUniqueUser((string) $user->getIdentity(), $user->getEmail(), $user->getUuid());
 
         if (array_key_exists('roles', $data) && count($data['roles']) > 0) {
             $user->resetRoles();
@@ -222,11 +227,15 @@ private function anonymizeUser(User $user): User
 
         $user
             ->setStatus(UserStatusEnum::Deleted)
-            ->setIdentity($placeholder . $this->config['userAnonymizeAppend'])
-            ->getDetail()
-            ->setFirstName($placeholder)
-            ->setLastName($placeholder)
-            ->setEmail($placeholder);
+            ->setIdentity($placeholder . $this->config['userAnonymizeAppend']);
+        if ($user->hasDetail()) {
+            assert($user->getDetail() instanceof UserDetail);
+            $user
+                ->getDetail()
+                ->setFirstName($placeholder)
+                ->setLastName($placeholder)
+                ->setEmail($placeholder);
+        }
 
         $this->userRepository->saveResource($user);
 
@@ -243,7 +252,7 @@ private function getAnonymousPlaceholder(): string
 
     private function revokeTokens(User $user): void
     {
-        $accessTokens = $this->oAuthAccessTokenRepository->findAccessTokens($user->getIdentity());
+        $accessTokens = $this->oAuthAccessTokenRepository->findAccessTokens((string) $user->getIdentity());
         foreach ($accessTokens as $accessToken) {
             $this->oAuthAccessTokenRepository->revokeAccessToken($accessToken->getToken());
             $this->oAuthRefreshTokenRepository->revokeRefreshToken($accessToken->getToken());
@@ -270,6 +279,7 @@ private function validateUniqueUser(string $identity, string $email, ?UuidInterf
             if ($uuid === null) {
                 throw new ConflictException(Message::DUPLICATE_EMAIL);
             }
+            assert($userDetail->getUser() instanceof User);
             if ($userDetail->getUser()->getUuid()->toString() !== $uuid->toString()) {
                 throw new ConflictException(Message::DUPLICATE_EMAIL);
             }

test/Common/TestCase.php

@@ -4,7 +4,6 @@
 
 namespace AdminTest\Common;
 
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
@@ -49,6 +48,7 @@ protected function getContainer(): ContainerInterface
         if (! $this->container instanceof ContainerInterface) {
             $this->container = require realpath(__DIR__ . '/../../config/container.php');
         }
+        $this->assertInstanceOf(ContainerInterface::class, $this->container);
 
         return $this->container;
     }
@@ -60,8 +60,9 @@ protected function getContainer(): ContainerInterface
     protected function getEntityManager(): EntityManagerInterface
     {
         if (! $this->entityManager instanceof EntityManagerInterface) {
-            $this->entityManager = $this->getContainer()->get(EntityManager::class);
+            $this->entityManager = $this->getContainer()->get(EntityManagerInterface::class);
         }
+        $this->assertInstanceOf(EntityManagerInterface::class, $this->entityManager);
 
         return $this->entityManager;
     }

test/Functional/FunctionalTest.php

@@ -40,6 +40,7 @@ protected function getApp(): Application
         if (! $this->app instanceof Application) {
             $this->app = $this->getContainer()->get(Application::class);
         }
+        $this->assertInstanceOf(Application::class, $this->app);
 
         return $this->app;
     }

test/Unit/Admin/Entity/AdminLoginTest.php

@@ -80,6 +80,7 @@ public function testAccessors(): void
         $this->assertSame(YesNoEnum::No, $adminLogin->getIsMobile());
         $adminLogin = $adminLogin->setIsMobile(YesNoEnum::Yes);
         $this->assertSame(AdminLogin::class, $adminLogin::class);
+        $this->assertNotNull($adminLogin->getIsMobile());
         $this->assertSame('yes', $adminLogin->getIsMobile()->value);
 
         $this->assertNull($adminLogin->getOsName());
@@ -120,6 +121,7 @@ public function testAccessors(): void
         $this->assertSame(SuccessFailureEnum::Fail, $adminLogin->getLoginStatus());
         $adminLogin = $adminLogin->setLoginStatus(SuccessFailureEnum::Success);
         $this->assertSame(AdminLogin::class, $adminLogin::class);
+        $this->assertNotNull($adminLogin->getLoginStatus());
         $this->assertSame('success', $adminLogin->getLoginStatus()->value);
 
         $this->assertNull($adminLogin->getIdentity());