implemented phpstan

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

Author: MarioRadu

composer.json

@@ -82,6 +82,9 @@
         "laminas/laminas-development-mode": "^3.12.0",
         "laminas/laminas-http": "^2.19.0",
         "mezzio/mezzio-tooling": "^2.9.0",
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-doctrine": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
         "phpunit/phpunit": "^10.5.10",
         "roave/security-advisories": "dev-latest",
         "symfony/var-dumper": "^7.1",

phpstan.neon

@@ -0,0 +1,16 @@
+includes:
+    - vendor/phpstan/phpstan-doctrine/extension.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+parameters:
+    level: 5
+    paths:
+        - src
+        - test
+    treatPhpDocTypesAsCertain: false
+    ignoreErrors:
+        -
+            message: '#Call to an undefined method.*setAllowOverride#'
+            path: test/Functional/AbstractFunctionalTest.php
+        -
+            message: '#Call to an undefined method.*setService#'
+            path: test/Functional/AbstractFunctionalTest.php

src/Admin/src/Service/AdminService.php

@@ -64,11 +64,7 @@ public function deleteAdmin(Admin $admin): void
 
     public function exists(string $identity = ''): bool
     {
-        try {
-            return $this->findOneBy(['identity' => $identity]) instanceof Admin;
-        } catch (NotFoundException) {
-            return false;
-        }
+        return $this->adminRepository->findOneBy(['identity' => $identity]) instanceof Admin;
     }
 
     public function existsOther(string $identity = '', string $uuid = ''): bool

src/App/src/Entity/OAuthAccessToken.php

@@ -7,7 +7,6 @@
 use Api\App\Repository\OAuthAccessTokenRepository;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Lcobucci\JWT\Configuration;
@@ -46,7 +45,7 @@ class OAuthAccessToken implements AccessTokenEntityInterface
     #[ORM\JoinTable(name: "oauth_access_token_scopes")]
     #[ORM\JoinColumn(name: "access_token_id", referencedColumnName: "id")]
     #[ORM\InverseJoinColumn(name: "scope_id", referencedColumnName: "id")]
-    protected Collection $scopes;
+    protected ArrayCollection $scopes;
 
     #[ORM\Column(name: 'expires_at', type: "datetime_immutable")]
     private DateTimeImmutable $expiresAt;

src/App/src/Entity/OAuthAuthCode.php

@@ -7,7 +7,6 @@
 use Api\App\Repository\OAuthAuthCodeRepository;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
@@ -39,7 +38,7 @@ class OAuthAuthCode implements AuthCodeEntityInterface
     #[ORM\JoinTable(name: "oauth_auth_code_scopes")]
     #[ORM\JoinColumn(name: "auth_code_id", referencedColumnName: "id")]
     #[ORM\InverseJoinColumn(name: "scope_id", referencedColumnName: "id")]
-    protected Collection $scopes;
+    protected ArrayCollection $scopes;
 
     #[ORM\Column(type: "datetime_immutable", nullable: true)]
     private DateTimeImmutable $expiresDatetime;
@@ -57,7 +56,7 @@ public function setId(int $id): self
         return $this;
     }
 
-    public function getId(): ?int
+    public function getId(): int
     {
         return $this->id;
     }
@@ -74,9 +73,9 @@ public function getClient(): ClientEntityInterface
         return $this->client;
     }
 
-    public function getIdentifier(): ?int
+    public function getIdentifier(): string
     {
-        return $this->getId();
+        return (string) $this->getId();
     }
 
     /**

src/App/src/Entity/OAuthScope.php

@@ -27,10 +27,10 @@ class OAuthScope implements ScopeEntityInterface
     private string $scope = '';
 
     #[ORM\ManyToMany(targetEntity: OAuthAccessToken::class, mappedBy: "scopes")]
-    protected Collection $accessTokens;
+    protected ArrayCollection $accessTokens;
 
     #[ORM\ManyToMany(targetEntity: OAuthAuthCode::class, mappedBy: "scopes")]
-    protected Collection $authCodes;
+    protected ArrayCollection $authCodes;
 
     public function __construct()
     {

src/App/src/Repository/OAuthClientRepository.php

@@ -52,7 +52,7 @@ public function getClientEntity($clientIdentifier): ?ClientEntityInterface
     public function validateClient($clientIdentifier, $clientSecret, $grantType): bool
     {
         $client = $this->getClientEntity($clientIdentifier);
-        if (! $client instanceof ClientEntityInterface) {
+        if (! $client instanceof OAuthClient) {
             return false;
         }
 

src/App/src/UserIdentity.php

@@ -9,7 +9,7 @@
 class UserIdentity implements UserInterface
 {
     protected string $identity;
-    /** @var iterable<int|string, string> $roles */
+    /** @var array<int|string, string> $roles */
     protected array $roles;
     protected array $details;
 

test/Functional/AbstractFunctionalTest.php

@@ -18,7 +18,6 @@
 use Fig\Http\Message\RequestMethodInterface;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\ServerRequest;
-use Laminas\ServiceManager\ServiceManager;
 use Mezzio\Application;
 use Mezzio\MiddlewareFactory;
 use PHPUnit\Framework\TestCase;
@@ -31,7 +30,6 @@
 
 use function array_merge;
 use function getenv;
-use function method_exists;
 use function putenv;
 use function realpath;
 
@@ -41,7 +39,7 @@ class AbstractFunctionalTest extends TestCase
     use DatabaseTrait;
 
     protected Application $app;
-    protected ContainerInterface|ServiceManager $container;
+    protected ContainerInterface $container;
     protected const DEFAULT_PASSWORD = 'dotkernel';
 
     /**
@@ -59,12 +57,8 @@ public function setUp(): void
 
         $this->ensureTestMode();
 
-        if (method_exists($this, 'runMigrations')) {
-            $this->runMigrations();
-        }
-        if (method_exists($this, 'runSeeders')) {
-            $this->runSeeders();
-        }
+        $this->runMigrations();
+        $this->runSeeders();
     }
 
     public function tearDown(): void
@@ -132,7 +126,7 @@ protected function getEntityManager(): EntityManagerInterface
         return $this->container->get(EntityManagerInterface::class);
     }
 
-    protected function getContainer(): ContainerInterface|ServiceManager
+    protected function getContainer(): ContainerInterface
     {
         return $this->container;
     }
@@ -150,7 +144,7 @@ private function ensureTestMode(): void
             );
         }
 
-        if (! $this->getEntityManager()->getConnection()->getParams()['memory'] ?? false) {
+        if (! ($this->getEntityManager()->getConnection()->getParams()['memory'] ?? false)) {
             throw new RuntimeException(
                 'You are running tests in a non in-memory database. Did you forget to create local.test.php?'
             );
@@ -271,7 +265,7 @@ private function createRequest(
         string $body = 'php://input',
         string $protocol = '1.1'
     ): ServerRequestInterface {
-        if (method_exists($this, 'isAuthenticated') && $this->isAuthenticated()) {
+        if ($this->isAuthenticated()) {
             $headers = array_merge($headers, $this->getAuthorizationHeader());
         }
 

test/Unit/Admin/Service/AdminServiceTest.php

@@ -21,8 +21,8 @@
 class AdminServiceTest extends TestCase
 {
     private Subject|MockObject $subject;
-    private AdminRoleService $adminRoleService;
-    private AdminRepository $adminRepository;
+    private AdminRoleService|MockObject $adminRoleService;
+    private AdminRepository|MockObject $adminRepository;
 
     /**
      * @throws \PHPUnit\Framework\MockObject\Exception