Fixed repository service method variable type issues

Author: tarlepp

src/Repository/ApiKeyRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repository;
 
 use App\Entity\ApiKey as Entity;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -18,7 +19,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/DateDimensionRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repository;
 
 use App\Entity\DateDimension as Entity;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -18,7 +19,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/HealthzRepository.php

@@ -12,6 +12,7 @@
 use DateInterval;
 use DateTimeImmutable;
 use DateTimeZone;
+use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\Persistence\ManagerRegistry;
@@ -25,7 +26,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/Interfaces/BaseRepositoryInterface.php

@@ -73,13 +73,11 @@ public function createQueryBuilder(?string $alias = null, ?string $indexBy = nul
     /**
      * Wrapper for default Doctrine repository find method.
      *
-     * @psalm-param LockMode::*|null $lockMode
-     *
      * @throws ORMException
      * @throws OptimisticLockException
      * @throws TransactionRequiredException
      */
-    public function find(string $id, ?int $lockMode = null, ?int $lockVersion = null): ?EntityInterface;
+    public function find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null): ?EntityInterface;
 
     /**
      * Advanced version of find method, with this you can process query as you

src/Repository/LogLoginFailureRepository.php

@@ -10,6 +10,7 @@
 
 use App\Entity\LogLoginFailure as Entity;
 use App\Entity\User;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;
 
@@ -20,7 +21,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/LogLoginRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repository;
 
 use App\Entity\LogLogin as Entity;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -18,7 +19,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/LogRequestRepository.php

@@ -12,6 +12,7 @@
 use DateInterval;
 use DateTimeImmutable;
 use DateTimeZone;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
 
@@ -22,7 +23,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/RoleRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repository;
 
 use App\Entity\Role as Entity;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -18,7 +19,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)

src/Repository/Traits/RepositoryMethodsTrait.php

@@ -26,10 +26,7 @@
  */
 trait RepositoryMethodsTrait
 {
-    /**
-     * @psalm-param LockMode::*|null $lockMode
-     */
-    public function find(string $id, ?int $lockMode = null, ?int $lockVersion = null): ?EntityInterface
+    public function find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null): ?EntityInterface
     {
         $output = $this->getEntityManager()->find($this->getEntityName(), $id, $lockMode, $lockVersion);
 
@@ -39,7 +36,7 @@ public function find(string $id, ?int $lockMode = null, ?int $lockVersion = null
     /**
      * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
      */
-    public function findAdvanced(string $id, string | int | null $hydrationMode = null): null | array | EntityInterface
+    public function findAdvanced(string $id, string|int|null $hydrationMode = null): null | array | EntityInterface
     {
         // Get query builder
         $queryBuilder = $this->getQueryBuilder();
@@ -62,9 +59,7 @@ public function findAdvanced(string $id, string | int | null $hydrationMode = nu
 
     public function findOneBy(array $criteria, ?array $orderBy = null): ?object
     {
-        $repository = $this->getEntityManager()->getRepository($this->getEntityName());
-
-        return $repository->findOneBy($criteria, $orderBy);
+        return $this->getEntityManager()->getRepository($this->getEntityName())->findOneBy($criteria, $orderBy);
     }
 
     /**
@@ -90,7 +85,7 @@ public function findByAdvanced(
         ?array $orderBy = null,
         ?int $limit = null,
         ?int $offset = null,
-        ?array $search = null
+        ?array $search = null,
     ): array {
         // Get query builder
         $queryBuilder = $this->getQueryBuilder($criteria, $search, $orderBy, $limit, $offset);
@@ -200,7 +195,7 @@ private function getQueryBuilder(
         ?array $search = null,
         ?array $orderBy = null,
         ?int $limit = null,
-        ?int $offset = null
+        ?int $offset = null,
     ): QueryBuilder {
         // Create new QueryBuilder for this instance
         $queryBuilder = $this->createQueryBuilder();

src/Repository/UserGroupRepository.php

@@ -9,6 +9,7 @@
 namespace App\Repository;
 
 use App\Entity\UserGroup as Entity;
+use Doctrine\DBAL\LockMode;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -18,7 +19,7 @@
  * @psalm-suppress LessSpecificImplementedReturnType
  * @codingStandardsIgnoreStart
  *
- * @method Entity|null find(string $id, ?int $lockMode = null, ?int $lockVersion = null)
+ * @method Entity|null find(string $id, LockMode|int|null $lockMode = null, ?int $lockVersion = null)
  * @method Entity|null findAdvanced(string $id, string | int | null $hydrationMode = null)
  * @method Entity|null findOneBy(array $criteria, ?array $orderBy = null)
  * @method Entity[] findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)