chore: use psalm level 2 (#359)

rgomezcasas · web-flow · commit ff40d42db376 · 2023-10-03T15:58:47.000+02:00
diff --git a/apps/backoffice/backend/src/Controller/Courses/CoursesGetController.php b/apps/backoffice/backend/src/Controller/Courses/CoursesGetController.php
@@ -28,8 +28,8 @@ public function __invoke(Request $request): JsonResponse
         $response = $this->queryBus->ask(
             new SearchBackofficeCoursesByCriteriaQuery(
                 (array) $request->query->get('filters'),
-                $orderBy === null ? null : (string) $orderBy,
-                $order === null ? null : (string) $order,
+                $orderBy === null ? null : $orderBy,
+                $order === null ? null : $order,
                 $limit === null ? null : (int) $limit,
                 $offset === null ? null : (int) $offset
             )
diff --git a/composer.json b/composer.json
@@ -56,7 +56,8 @@
     "vimeo/psalm": "^5.15",
     "rector/rector": "^0.18.4",
     "psalm/plugin-mockery": "^1.1",
-    "psalm/plugin-symfony": "^5.0"
+    "psalm/plugin-symfony": "^5.0",
+    "psalm/plugin-phpunit": "^0.18.4"
   },
   "autoload": {
     "psr-4": {
diff --git a/composer.lock b/composer.lock
diff --git a/psalm.xml b/psalm.xml
@@ -3,10 +3,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    errorLevel="3"
+    errorLevel="2"
     resolveFromConfigFile="true"
     findUnusedBaselineEntry="false"
     findUnusedCode="false"
+    allowStringToStandInForClass="true"
 >
     <projectFiles>
         <directory name="apps"/>
@@ -44,15 +45,26 @@
                 <directory name="tests"/>
             </errorLevel>
         </PossiblyNullArgument>
+        <PropertyNotSetInConstructor>
+            <errorLevel type="suppress">
+                <directory name="tests"/>
+            </errorLevel>
+        </PropertyNotSetInConstructor>
         <MoreSpecificReturnType>
             <errorLevel type="suppress">
                 <file name="apps/*/*/src/*Kernel.php"/>
             </errorLevel>
         </MoreSpecificReturnType>
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="apps/*/*/src/*Kernel.php"/>
+            </errorLevel>
+        </UnresolvableInclude>
     </issueHandlers>
 
     <plugins>
         <pluginClass class="Psalm\MockeryPlugin\Plugin"/>
         <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
+        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
     </plugins>
 </psalm>
diff --git a/src/Mooc/Shared/Infrastructure/Doctrine/DbalTypesSearcher.php b/src/Mooc/Shared/Infrastructure/Doctrine/DbalTypesSearcher.php
@@ -33,7 +33,7 @@ private static function modulesInPath(string $path): array
     private static function possibleDbalPaths(string $path): array
     {
         return map(
-            static function ($unused, string $module) use ($path) {
+            static function (mixed $_unused, string $module) use ($path) {
                 $mappingsPath = self::MAPPINGS_PATH;
 
                 return realpath("$path/$module/$mappingsPath");
@@ -51,7 +51,7 @@ private static function dbalClassesSearcher(string $contextName): callable
     {
         return static function (array $totalNamespaces, string $path) use ($contextName): array {
             $possibleFiles = scandir($path);
-            $files = filter(static fn ($file): bool => Utils::endsWith('Type.php', $file), $possibleFiles);
+            $files = filter(static fn (string $file): bool => Utils::endsWith('Type.php', $file), $possibleFiles);
 
             $namespaces = map(
                 static function (string $file) use ($path, $contextName): string {
diff --git a/src/Mooc/Shared/Infrastructure/Doctrine/DoctrinePrefixesSearcher.php b/src/Mooc/Shared/Infrastructure/Doctrine/DoctrinePrefixesSearcher.php
@@ -31,7 +31,7 @@ private static function modulesInPath(string $path): array
     private static function possibleMappingPaths(string $path): array
     {
         return map(
-            static function ($unused, string $module) use ($path) {
+            static function (mixed $_unused, string $module) use ($path) {
                 $mappingsPath = self::MAPPINGS_PATH;
 
                 return realpath("$path/$module/$mappingsPath");
diff --git a/src/Mooc/Videos/Application/Find/FindVideoQueryHandler.php b/src/Mooc/Videos/Application/Find/FindVideoQueryHandler.php
@@ -8,21 +8,22 @@
 use CodelyTv\Shared\Domain\Bus\Query\QueryHandler;
 
 use function Lambdish\Phunctional\apply;
-use function Lambdish\Phunctional\pipe;
 
-final class FindVideoQueryHandler implements QueryHandler
+final readonly class FindVideoQueryHandler implements QueryHandler
 {
-    private $finder;
+    private VideoResponseConverter $responseConverter;
 
-    public function __construct(VideoFinder $finder)
+    public function __construct(private VideoFinder $finder)
     {
-        $this->finder = pipe($finder, new VideoResponseConverter());
+        $this->responseConverter = new VideoResponseConverter();
     }
 
     public function __invoke(FindVideoQuery $query): VideoResponse
     {
         $id = new VideoId($query->id());
 
-        return apply($this->finder, [$id]);
+        $video = apply($this->finder, [$id]);
+
+        return apply($this->responseConverter, [$video]);
     }
 }
diff --git a/src/Shared/Domain/Assert.php b/src/Shared/Domain/Assert.php
@@ -15,7 +15,7 @@ public static function arrayOf(string $class, array $items): void
         }
     }
 
-    public static function instanceOf(string $class, $item): void
+    public static function instanceOf(string $class, mixed $item): void
     {
         if (!$item instanceof $class) {
             throw new InvalidArgumentException(
diff --git a/src/Shared/Domain/ValueObject/Uuid.php b/src/Shared/Domain/ValueObject/Uuid.php
@@ -10,7 +10,7 @@
 
 abstract class Uuid implements Stringable
 {
-    public function __construct(protected string $value)
+    final public function __construct(protected string $value)
     {
         $this->ensureIsValidUuid($value);
     }
diff --git a/src/Shared/Infrastructure/Bus/CallableFirstParameterExtractor.php b/src/Shared/Infrastructure/Bus/CallableFirstParameterExtractor.php
@@ -28,7 +28,7 @@ public static function forPipedCallables(iterable $callables): array
 
     private static function classExtractor(self $parameterExtractor): callable
     {
-        return static fn (callable $handler): ?string => $parameterExtractor->extract($handler);
+        return static fn (object $handler): ?string => $parameterExtractor->extract($handler);
     }
 
     private static function pipedCallablesReducer(): callable
@@ -46,10 +46,10 @@ private static function pipedCallablesReducer(): callable
 
     private static function unflatten(): callable
     {
-        return static fn ($value): array => [$value];
+        return static fn (mixed $value): array => [$value];
     }
 
-    public function extract($class): ?string
+    public function extract(object $class): ?string
     {
         $reflector = new ReflectionClass($class);
         $method = $reflector->getMethod('__invoke');
@@ -63,7 +63,7 @@ public function extract($class): ?string
 
     private function firstParameterClassFrom(ReflectionMethod $method): string
     {
-        /** @var ReflectionNamedType $fistParameterType */
+        /** @var ReflectionNamedType|null $fistParameterType */
         $fistParameterType = $method->getParameters()[0]->getType();
 
         if ($fistParameterType === null) {
diff --git a/src/Shared/Infrastructure/Bus/Event/DomainEventJsonDeserializer.php b/src/Shared/Infrastructure/Bus/Event/DomainEventJsonDeserializer.php
@@ -6,7 +6,6 @@
 
 use CodelyTv\Shared\Domain\Bus\Event\DomainEvent;
 use CodelyTv\Shared\Domain\Utils;
-use RuntimeException;
 
 final readonly class DomainEventJsonDeserializer
 {
@@ -18,10 +17,6 @@ public function deserialize(string $domainEvent): DomainEvent
         $eventName = $eventData['data']['type'];
         $eventClass = $this->mapping->for($eventName);
 
-        if ($eventClass === null) {
-            throw new RuntimeException("The event <$eventName> doesn't exist or has no subscribers");
-        }
-
         return $eventClass::fromPrimitives(
             $eventData['data']['attributes']['id'],
             $eventData['data']['attributes'],
diff --git a/src/Shared/Infrastructure/Bus/Event/DomainEventMapping.php b/src/Shared/Infrastructure/Bus/Event/DomainEventMapping.php
@@ -12,14 +12,14 @@
 
 final class DomainEventMapping
 {
-    private $mapping;
+    private array $mapping;
 
     public function __construct(iterable $mapping)
     {
         $this->mapping = reduce($this->eventsExtractor(), $mapping, []);
     }
 
-    public function for(string $name)
+    public function for(string $name): string
     {
         if (!isset($this->mapping[$name])) {
             throw new RuntimeException("The Domain Event Class for <$name> doesn't exists or have no subscribers");
diff --git a/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineDomainEventsConsumer.php b/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineDomainEventsConsumer.php
@@ -8,7 +8,6 @@
 use CodelyTv\Shared\Infrastructure\Bus\Event\DomainEventMapping;
 use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\FetchMode;
 use Doctrine\ORM\EntityManager;
 use RuntimeException;
 
@@ -28,14 +27,14 @@ public function consume(callable $subscribers, int $eventsToConsume): void
     {
         $events = $this->connection
             ->executeQuery("SELECT * FROM domain_events ORDER BY occurred_on ASC LIMIT $eventsToConsume")
-            ->fetchAll(FetchMode::ASSOCIATIVE);
+            ->fetchAllAssociative();
 
         each($this->executeSubscribers($subscribers), $events);
 
         $ids = implode(', ', map($this->idExtractor(), $events));
 
         if (!empty($ids)) {
-            $this->connection->executeUpdate("DELETE FROM domain_events WHERE id IN ($ids)");
+            $this->connection->executeStatement("DELETE FROM domain_events WHERE id IN ($ids)");
         }
     }
 
@@ -57,7 +56,7 @@ private function executeSubscribers(callable $subscribers): callable
         };
     }
 
-    private function formatDate($stringDate): string
+    private function formatDate(mixed $stringDate): string
     {
         return Utils::dateToString(new DateTimeImmutable($stringDate));
     }
diff --git a/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineEventBus.php b/src/Shared/Infrastructure/Bus/Event/MySql/MySqlDoctrineEventBus.php
@@ -38,7 +38,7 @@ private function publisher(): callable
                 Utils::stringToDate($domainEvent->occurredOn())->format(self::DATABASE_TIMESTAMP_FORMAT)
             );
 
-            $this->connection->executeUpdate(
+            $this->connection->executeStatement(
                 <<<SQL
                                     INSERT INTO domain_events (id,  aggregate_id, name,  body,  occurred_on) 
                                                        VALUES ($id, $aggregateId, $name, $body, $occurredOn);
diff --git a/src/Shared/Infrastructure/Doctrine/DoctrineEntityManagerFactory.php b/src/Shared/Infrastructure/Doctrine/DoctrineEntityManagerFactory.php
@@ -5,6 +5,7 @@
 namespace CodelyTv\Shared\Infrastructure\Doctrine;
 
 use CodelyTv\Shared\Infrastructure\Doctrine\Dbal\DbalCustomTypesRegistrar;
+use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Platforms\MariaDBPlatform;
 use Doctrine\DBAL\Schema\MySQLSchemaManager;
@@ -35,7 +36,9 @@ public static function create(
 
         DbalCustomTypesRegistrar::register($dbalCustomTypesClasses);
 
-        return EntityManager::create($parameters, self::createConfiguration($contextPrefixes, $isDevMode));
+        $config = self::createConfiguration($contextPrefixes, $isDevMode);
+
+        return new EntityManager(DriverManager::getConnection($parameters, $config, new EventManager()), $config);
     }
 
     private static function generateDatabaseIfNotExists(array $parameters, string $schemaFile): void
@@ -51,14 +54,14 @@ private static function generateDatabaseIfNotExists(array $parameters, string $s
         if (!self::databaseExists($databaseName, $schemaManager)) {
             $schemaManager->createDatabase($databaseName);
 
-            $connection->exec(sprintf('USE %s', $databaseName));
-            $connection->exec(file_get_contents(realpath($schemaFile)));
+            $connection->executeStatement(sprintf('USE %s', $databaseName));
+            $connection->executeStatement(file_get_contents(realpath($schemaFile)));
         }
 
         $connection->close();
     }
 
-    private static function databaseExists($databaseName, MySqlSchemaManager $schemaManager): bool
+    private static function databaseExists(string $databaseName, MySqlSchemaManager $schemaManager): bool
     {
         return in_array($databaseName, $schemaManager->listDatabases(), true);
     }
diff --git a/src/Shared/Infrastructure/Persistence/Doctrine/DoctrineCriteriaConverter.php b/src/Shared/Infrastructure/Persistence/Doctrine/DoctrineCriteriaConverter.php
@@ -64,7 +64,7 @@ private function buildComparison(): callable
         };
     }
 
-    private function mapFieldValue(FilterField $field)
+    private function mapFieldValue(FilterField $field): mixed
     {
         return array_key_exists($field->value(), $this->criteriaToDoctrineFields)
             ? $this->criteriaToDoctrineFields[$field->value()]
@@ -80,19 +80,19 @@ private function formatOrder(Criteria $criteria): ?array
         return [$this->mapOrderBy($criteria->order()->orderBy()) => $criteria->order()->orderType()];
     }
 
-    private function mapOrderBy(OrderBy $field)
+    private function mapOrderBy(OrderBy $field): mixed
     {
         return array_key_exists($field->value(), $this->criteriaToDoctrineFields)
             ? $this->criteriaToDoctrineFields[$field->value()]
             : $field->value();
     }
 
-    private function existsHydratorFor($field): bool
+    private function existsHydratorFor(mixed $field): bool
     {
         return array_key_exists($field, $this->hydrators);
     }
 
-    private function hydrate($field, string $value)
+    private function hydrate(mixed $field, string $value): mixed
     {
         return $this->hydrators[$field]($value);
     }
diff --git a/tests/Shared/Domain/DuplicatorMother.php b/tests/Shared/Domain/DuplicatorMother.php
@@ -11,7 +11,7 @@
 
 final class DuplicatorMother
 {
-    public static function with($object, array $newParams): mixed
+    public static function with(mixed $object, array $newParams): mixed
     {
         $duplicated = clone $object;
         $reflection = new ReflectionObject($duplicated);
diff --git a/tests/Shared/Domain/TestUtils.php b/tests/Shared/Domain/TestUtils.php
diff --git a/tests/Shared/Infrastructure/Behat/ApiContext.php b/tests/Shared/Infrastructure/Behat/ApiContext.php
diff --git a/tests/Shared/Infrastructure/Doctrine/MySqlDatabaseCleaner.php b/tests/Shared/Infrastructure/Doctrine/MySqlDatabaseCleaner.php
diff --git a/tests/Shared/Infrastructure/Mockery/CodelyTvMatcherIsSimilar.php b/tests/Shared/Infrastructure/Mockery/CodelyTvMatcherIsSimilar.php
diff --git a/tests/Shared/Infrastructure/PhpUnit/Comparator/DateTimeStringSimilarComparator.php b/tests/Shared/Infrastructure/PhpUnit/Comparator/DateTimeStringSimilarComparator.php
diff --git a/tests/Shared/Infrastructure/PhpUnit/InfrastructureTestCase.php b/tests/Shared/Infrastructure/PhpUnit/InfrastructureTestCase.php
diff --git a/tests/Shared/Infrastructure/PhpUnit/UnitTestCase.php b/tests/Shared/Infrastructure/PhpUnit/UnitTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private static function modulesInPath(string $path): array`
`31`	`31`	`private static function possibleMappingPaths(string $path): array`
`32`	`32`	`{`
`33`	`33`	`return map(`
`34`		`- static function ($unused, string $module) use ($path) {`
	`34`	`+ static function (mixed $_unused, string $module) use ($path) {`
`35`	`35`	`$mappingsPath = self::MAPPINGS_PATH;`
`36`	`36`
`37`	`37`	`return realpath("$path/$module/$mappingsPath");`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,22 @@`
`8`	`8`	`use CodelyTv\Shared\Domain\Bus\Query\QueryHandler;`
`9`	`9`
`10`	`10`	`use function Lambdish\Phunctional\apply;`
`11`		`-use function Lambdish\Phunctional\pipe;`
`12`	`11`
`13`		`-final class FindVideoQueryHandler implements QueryHandler`
	`12`	`+final readonly class FindVideoQueryHandler implements QueryHandler`
`14`	`13`	`{`
`15`		`- private $finder;`
	`14`	`+ private VideoResponseConverter $responseConverter;`
`16`	`15`
`17`		`- public function __construct(VideoFinder $finder)`
	`16`	`+ public function __construct(private VideoFinder $finder)`
`18`	`17`	`{`
`19`		`- $this->finder = pipe($finder, new VideoResponseConverter());`
	`18`	`+ $this->responseConverter = new VideoResponseConverter();`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`public function __invoke(FindVideoQuery $query): VideoResponse`
`23`	`22`	`{`
`24`	`23`	`$id = new VideoId($query->id());`
`25`	`24`
`26`		`- return apply($this->finder, [$id]);`
	`25`	`+ $video = apply($this->finder, [$id]);`
	`26`	`+`
	`27`	`+ return apply($this->responseConverter, [$video]);`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static function arrayOf(string $class, array $items): void`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- public static function instanceOf(string $class, $item): void`
	`18`	`+ public static function instanceOf(string $class, mixed $item): void`
`19`	`19`	`{`
`20`	`20`	`if (!$item instanceof $class) {`
`21`	`21`	`throw new InvalidArgumentException(`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`abstract class Uuid implements Stringable`
`12`	`12`	`{`
`13`		`- public function __construct(protected string $value)`
	`13`	`+ final public function __construct(protected string $value)`
`14`	`14`	`{`
`15`	`15`	`$this->ensureIsValidUuid($value);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static function forPipedCallables(iterable $callables): array`
`28`	`28`
`29`	`29`	`private static function classExtractor(self $parameterExtractor): callable`
`30`	`30`	`{`
`31`		`- return static fn (callable $handler): ?string => $parameterExtractor->extract($handler);`
	`31`	`+ return static fn (object $handler): ?string => $parameterExtractor->extract($handler);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`private static function pipedCallablesReducer(): callable`
`@@ -46,10 +46,10 @@ private static function pipedCallablesReducer(): callable`
`46`	`46`
`47`	`47`	`private static function unflatten(): callable`
`48`	`48`	`{`
`49`		`- return static fn ($value): array => [$value];`
	`49`	`+ return static fn (mixed $value): array => [$value];`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function extract($class): ?string`
	`52`	`+ public function extract(object $class): ?string`
`53`	`53`	`{`
`54`	`54`	`$reflector = new ReflectionClass($class);`
`55`	`55`	`$method = $reflector->getMethod('__invoke');`
`@@ -63,7 +63,7 @@ public function extract($class): ?string`
`63`	`63`
`64`	`64`	`private function firstParameterClassFrom(ReflectionMethod $method): string`
`65`	`65`	`{`
`66`		`- /** @var ReflectionNamedType $fistParameterType */`
	`66`	`+ /** @var ReflectionNamedType\|null $fistParameterType */`
`67`	`67`	`$fistParameterType = $method->getParameters()[0]->getType();`
`68`	`68`
`69`	`69`	`if ($fistParameterType === null) {`