small improvements

Author: DKravtsov

ecs.php

@@ -83,7 +83,8 @@
                             'case',
                             'continue',
                             'curly_brace_block',
-                            'default', 'extra',
+                            'default',
+                            'extra',
                             'parenthesis_brace_block',
                             'return',
                             'square_brace_block',

src/Decorator/StopwatchDecorator.php

@@ -14,6 +14,7 @@
 
 use function array_filter;
 use function is_object;
+use function str_contains;
 use function str_starts_with;
 
 /**
@@ -39,6 +40,7 @@ public function decorate(object $service): object
             $class->getFileName() === false
             || $class->isFinal()
             || str_starts_with($class->getName(), 'ProxyManagerGeneratedProxy')
+            || str_contains($class->getName(), 'RequestStack')
         ) {
             return $service;
         }

src/Repository/Interfaces/BaseRepositoryInterface.php

@@ -5,6 +5,8 @@
 namespace App\Repository\Interfaces;
 
 use App\Entity\Interfaces\EntityInterface;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\NonUniqueResultException;
@@ -68,6 +70,8 @@ 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
@@ -78,6 +82,8 @@ public function find(string $id, ?int $lockMode = null, ?int $lockVersion = null
      * Advanced version of find method, with this you can process query as you like, eg. add joins and callbacks to
      * modify / optimize current query.
      *
+     * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
+     *
      * @psalm-return array<int|string, mixed>|EntityInterface|null
      *
      * @throws NonUniqueResultException

src/Repository/Traits/RepositoryMethodsTrait.php

@@ -7,6 +7,8 @@
 use App\Entity\Interfaces\EntityInterface;
 use App\Rest\RepositoryHelper;
 use App\Rest\UuidHelper;
+use Doctrine\DBAL\LockMode;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\OptimisticLockException;
@@ -29,7 +31,7 @@ trait RepositoryMethodsTrait
     /**
      * Wrapper for default Doctrine repository find method.
      *
-     * @phpstan-param 0|1|2|4|null $lockMode
+     * @psalm-param LockMode::*|null $lockMode
      *
      * @throws TransactionRequiredException
      * @throws OptimisticLockException
@@ -46,7 +48,7 @@ public function find(string $id, ?int $lockMode = null, ?int $lockVersion = null
     /**
      * {@inheritdoc}
      *
-     * @phpstan-param 1|2|3|4|5|6|string|null $hydrationMode
+     * @psalm-param string|AbstractQuery::HYDRATE_*|null $hydrationMode
      */
     public function findAdvanced(string $id, string | int | null $hydrationMode = null): null | array | EntityInterface
     {