chore: fix phpstan, add phpstan/phpstan-beberlei-assert

Author: Bl00D4NGEL

composer.json

@@ -30,7 +30,8 @@
         "symfony/framework-bundle": "^6.0",
         "symfony/yaml": "^6.0 | ^7.0",
         "symfony/filesystem": "^6.0 | ^7.0",
-        "symfony/maker-bundle": "^1.48"
+        "symfony/maker-bundle": "^1.48",
+        "phpstan/phpstan-beberlei-assert": "^1.1"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -1,5 +1,6 @@
 includes:
     - vendor/phpstan/phpstan-mockery/extension.neon
+    - vendor/phpstan/phpstan-beberlei-assert/extension.neon
 
 parameters:
     level: max

phpstan.neon

@@ -4,6 +4,7 @@
 
 namespace GeekCell\DddBundle;
 
+use Assert\Assert;
 use GeekCell\DddBundle\DependencyInjection\GeekCellDddExtension;
 use GeekCell\Facade\Facade;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
@@ -31,6 +32,9 @@ public function getContainerExtension(): ?ExtensionInterface
     public function boot(): void
     {
         parent::boot();
-        Facade::setContainer($this->container);
+
+        if ($this->container !== null) {
+            Facade::setContainer($this->container);
+        }
     }
 }

src/GeekCellDddBundle.php

@@ -15,20 +15,12 @@
  */
 class Paginator implements PaginatorInterface
 {
-    /**
-     * @var int
-     */
     private readonly int $firstResult;
 
-    /**
-     * @var int
-     */
     private readonly int $maxResults;
 
     /**
-     * Constructor.
-     *
-     * @param OrmPaginator $ormPaginator
+     * @param OrmPaginator<T> $ormPaginator
      */
     public function __construct(
         private readonly OrmPaginator $ormPaginator,

src/Infrastructure/Doctrine/Paginator.php

@@ -22,17 +22,10 @@
  */
 abstract class Repository implements RepositoryInterface
 {
-    /**
-     * @var QueryBuilder
-     */
     private QueryBuilder $queryBuilder;
 
     /**
-     * Constructor.
-     *
-     * @param EntityManagerInterface $entityManager  The entity manager
-     * @param class-string $entityType               The entity class
-     * @param string $alias                          Entity alias
+     * @param class-string $entityType
      */
     public function __construct(
         protected EntityManagerInterface $entityManager,
@@ -56,10 +49,8 @@ public function __construct(
      */
     public function collect(): Collection
     {
-        /** @var array<object> $results */
+        /** @var array<T> $results */
         $results = $this->queryBuilder->getQuery()->getResult() ?? [];
-
-        /** @var Collection */
         return new Collection($results);
     }
 
@@ -80,9 +71,9 @@ function (QueryBuilder $queryBuilder) use (
             }
         );
 
-        return new DoctrinePaginator(
-            new OrmPaginator($repository->queryBuilder->getQuery())
-        );
+        /** @var OrmPaginator<T> $paginator */
+        $paginator = new OrmPaginator($repository->queryBuilder->getQuery());
+        return new DoctrinePaginator($paginator);
     }
 
     /**
@@ -116,9 +107,6 @@ public function filter(callable $filter): static
         return $clone;
     }
 
-    /**
-     * @inheritDoc
-     */
     public function __clone(): void
     {
         $this->queryBuilder = clone $this->queryBuilder;

src/Infrastructure/Doctrine/Repository.php

@@ -11,7 +11,7 @@
 
 abstract class AbstractIdType extends IntegerType
 {
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?int
     {
         if (is_int($value)) {
             return $value;
@@ -32,7 +32,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
         return intval($value->getValue());
     }
 
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Id
     {
         if ($value === null) {
             return null;
@@ -54,7 +54,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
     }
 
     /**
-     * @return class-string<Id> $entityType
+     * @return class-string<Id>
      */
     abstract protected function getIdType(): string;
 }

src/Infrastructure/Doctrine/Type/AbstractIdType.php

@@ -13,9 +13,8 @@ abstract class AbstractUuidType extends GuidType
 {
     /**
      * @inheritDoc
-     * @return string
      */
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
     {
         if (is_string($value)) {
             return $value;
@@ -38,9 +37,8 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
 
     /**
      * @inheritDoc
-     * @return Uuid
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): ?Uuid
     {
         if ($value === null) {
             return null;
@@ -62,7 +60,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
     }
 
     /**
-     * @return class-string<Uuid> $entityType
+     * @return class-string<Uuid>
      */
     abstract protected function getIdType(): string;
 }

src/Infrastructure/Doctrine/Type/AbstractUuidType.php

@@ -24,7 +24,7 @@ public function dispatch(Command $command): mixed
         try {
             return $this->handle($command);
         } catch (HandlerFailedException $e) {
-            $exceptions = $e->getNestedExceptions();
+            $exceptions = $e->getWrappedExceptions();
             throw $exceptions[0];
         }
     }

src/Infrastructure/Messenger/CommandBus.php

@@ -24,7 +24,7 @@ public function dispatch(Query $query): mixed
         try {
             return $this->handle($query);
         } catch (HandlerFailedException $e) {
-            $exceptions = $e->getNestedExceptions();
+            $exceptions = $e->getWrappedExceptions();
             throw $exceptions[0];
         }
     }