PHP 8.2 updates

composer.json

@@ -36,7 +36,6 @@
   "require-dev": {
     "doctrine/doctrine-bundle": "^2.0|^3.0",
     "league/flysystem-memory": "^3.0",
-    "phpspec/prophecy-phpunit": "^2.0",
     "phpstan/phpstan": "^1.4",
     "phpunit/phpunit": "^11.0|^12.0",
     "sonata-project/admin-bundle": "^4.0",

src/batch-doctrine-dbal/src/DoctrineDBALInsertWriter.php

@@ -14,7 +14,7 @@
  * via a Doctrine {@see Connection}.
  * All items must be arrays.
  */
-final class DoctrineDBALInsertWriter implements ItemWriterInterface
+final readonly class DoctrineDBALInsertWriter implements ItemWriterInterface
 {
     private Connection $connection;
 

src/batch-doctrine-dbal/src/DoctrineDBALJobExecutionStorage.php

@@ -42,8 +42,8 @@ final class DoctrineDBALJobExecutionStorage implements
         'connection' => null,
     ];
 
-    private Connection $connection;
-    private string $table;
+    private readonly Connection $connection;
+    private readonly string $table;
     private JobExecutionRowNormalizer $normalizer;
 
     /**
@@ -334,53 +334,53 @@ private function addWheres(Query $query, QueryBuilder $qb): array
         $queryTypes = [];
 
         $names = $query->jobs();
-        if (\count($names) > 0) {
+        if ($names !== []) {
             $qb->andWhere($qb->expr()->in('job_name', ':jobNames'));
             $queryParameters['jobNames'] = $names;
             $queryTypes['jobNames'] = ArrayParameterType::STRING;
         }
 
         $ids = $query->ids();
-        if (\count($ids) > 0) {
+        if ($ids !== []) {
             $qb->andWhere($qb->expr()->in('id', ':ids'));
             $queryParameters['ids'] = $ids;
             $queryTypes['ids'] = ArrayParameterType::STRING;
         }
 
         $statuses = $query->statuses();
-        if (\count($statuses) > 0) {
+        if ($statuses !== []) {
             $qb->andWhere($qb->expr()->in('status', ':statuses'));
             $queryParameters['statuses'] = $statuses;
             $queryTypes['statuses'] = ArrayParameterType::INTEGER;
         }
 
-        if ($query->startTime()) {
+        if ($query->startTime() !== null) {
             $qb->andWhere($qb->expr()->isNotNull('start_time'));
         }
         $startDateFrom = $query->startTime()?->getFrom();
-        if ($startDateFrom) {
+        if ($startDateFrom !== null) {
             $qb->andWhere($qb->expr()->gte('start_time', ':startDateFrom'));
             $queryParameters['startDateFrom'] = $startDateFrom;
             $queryTypes['startDateFrom'] = Types::DATETIME_IMMUTABLE;
         }
         $startDateTo = $query->startTime()?->getTo();
-        if ($startDateTo) {
+        if ($startDateTo !== null) {
             $qb->andWhere($qb->expr()->lte('start_time', ':startDateTo'));
             $queryParameters['startDateTo'] = $startDateTo;
             $queryTypes['startDateTo'] = Types::DATETIME_IMMUTABLE;
         }
 
-        if ($query->endTime()) {
+        if ($query->endTime() !== null) {
             $qb->andWhere($qb->expr()->isNotNull('start_time'));
         }
         $endDateFrom = $query->endTime()?->getFrom();
-        if ($endDateFrom) {
+        if ($endDateFrom !== null) {
             $qb->andWhere($qb->expr()->gte('end_time', ':endDateFrom'));
             $queryParameters['endDateFrom'] = $endDateFrom;
             $queryTypes['endDateFrom'] = Types::DATETIME_IMMUTABLE;
         }
         $endDateTo = $query->endTime()?->getTo();
-        if ($endDateTo) {
+        if ($endDateTo !== null) {
             $qb->andWhere($qb->expr()->lte('end_time', ':endDateTo'));
             $queryParameters['endDateTo'] = $endDateTo;
             $queryTypes['endDateTo'] = Types::DATETIME_IMMUTABLE;

src/batch-doctrine-dbal/src/DoctrineDBALQueryCursorReader.php

@@ -25,7 +25,7 @@
  * In that case, {@see DoctrineDBALQueryCursorReader::$column} argument should be "id",
  * and if id is a numeric column {@see DoctrineDBALQueryCursorReader::$start} should be 0.
  */
-final class DoctrineDBALQueryCursorReader implements ItemReaderInterface
+final readonly class DoctrineDBALQueryCursorReader implements ItemReaderInterface
 {
     private Connection $connection;
 

src/batch-doctrine-dbal/src/DoctrineDBALQueryOffsetReader.php

@@ -15,7 +15,7 @@
  * This {@see ItemReaderInterface} executes an SQL query to a Doctrine connection,
  * and iterate over each result as an item.
  */
-final class DoctrineDBALQueryOffsetReader implements ItemReaderInterface
+final readonly class DoctrineDBALQueryOffsetReader implements ItemReaderInterface
 {
     private Connection $connection;
     private string $sql;

src/batch-doctrine-dbal/src/DoctrineDBALUpsert.php

@@ -8,7 +8,7 @@
  * This model object is used by {@see DoctrineDBALUpsertWriter}.
  * It holds table, data and identity to perform upsert operation.
  */
-final class DoctrineDBALUpsert
+final readonly class DoctrineDBALUpsert
 {
     public function __construct(
         private string $table,

src/batch-doctrine-dbal/src/JobExecutionRowNormalizer.php

@@ -19,7 +19,7 @@
 /**
  * @internal
  */
-final class JobExecutionRowNormalizer
+final readonly class JobExecutionRowNormalizer
 {
     public function __construct(
         private AbstractPlatform $platform,

src/batch-doctrine-dbal/tests/DoctrineDBALJobExecutionStorageTest.php

@@ -41,7 +41,7 @@ public function testCreateStandardTable(): void
         self::assertTrue($schemaManager->tablesExist(['yokai_batch_job_execution']));
 
         $columns = $schemaManager->listTableColumns('yokai_batch_job_execution');
-        self::assertEquals(
+        self::assertSame(
             [
                 'id',
                 'job_name',
@@ -68,7 +68,7 @@ public function testCreateCustomTable(): void
         self::assertTrue($schemaManager->tablesExist(['acme_job_executions']));
 
         $columns = $schemaManager->listTableColumns('acme_job_executions');
-        self::assertEquals(
+        self::assertSame(
             [
                 'id',
                 'job_name',
@@ -279,7 +279,7 @@ public function testQuery(QueryBuilder $queryBuilder, array $expectedCouples): v
         $this->loadFixtures($storage);
 
         self::assertExecutions($expectedCouples, $storage->query($queryBuilder->getQuery()));
-        self::assertSame(\count($expectedCouples), $storage->count($queryBuilder->getQuery()));
+        self::assertCount($storage->count($queryBuilder->getQuery()), $expectedCouples);
     }
 
     public static function queries(): Generator

src/batch-doctrine-dbal/tests/Dummy/SingleConnectionRegistry.php

@@ -8,7 +8,7 @@
 use Doctrine\Persistence\ConnectionRegistry;
 use InvalidArgumentException;
 
-final class SingleConnectionRegistry implements ConnectionRegistry
+final readonly class SingleConnectionRegistry implements ConnectionRegistry
 {
     public function __construct(
         private Connection $connection,

src/batch-doctrine-orm/src/EntityReader.php

@@ -12,7 +12,7 @@
 /**
  * This {@see ItemReaderInterface} executes an SQL query to a Doctrine connection,
  */
-final class EntityReader implements ItemReaderInterface
+final readonly class EntityReader implements ItemReaderInterface
 {
     public function __construct(
         private ManagerRegistry $doctrine,

src/batch-doctrine-orm/tests/Dummy/SingleManagerRegistry.php

@@ -11,7 +11,7 @@
 final class SingleManagerRegistry extends AbstractManagerRegistry
 {
     public function __construct(
-        private ObjectManager $manager,
+        private readonly ObjectManager $manager,
     ) {
         parent::__construct('ORM', ['default'], ['default'], 'default', 'default', Proxy::class);
     }

src/batch-doctrine-orm/tests/Entity/User.php

@@ -4,18 +4,19 @@
 
 namespace Yokai\Batch\Tests\Bridge\Doctrine\ORM\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'user')]
 class User
 {
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     #[ORM\Id]
     #[ORM\GeneratedValue]
     public int $id;
 
-    #[ORM\Column(type: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     public string $name;
 
     public function __construct(string $name)

src/batch-doctrine-persistence/src/ObjectRegistry.php

@@ -21,7 +21,7 @@ final class ObjectRegistry
     private array $identities = [];
 
     public function __construct(
-        private ManagerRegistry $doctrine,
+        private readonly ManagerRegistry $doctrine,
     ) {
     }
 

src/batch-doctrine-persistence/src/ObjectWriter.php

@@ -26,7 +26,7 @@ final class ObjectWriter implements ItemWriterInterface
     private array $managerForClass = [];
 
     public function __construct(
-        private ManagerRegistry $doctrine,
+        private readonly ManagerRegistry $doctrine,
     ) {
     }
 

src/batch-doctrine-persistence/tests/Dummy/DecoratedRepositoryFactory.php

@@ -19,8 +19,8 @@ public function __construct(
         /**
          * @var class-string<EntityRepository>
          */
-        private string $class,
-        private RepositoryFactory $decorated,
+        private readonly string $class,
+        private readonly RepositoryFactory $decorated,
     ) {
     }
 

src/batch-doctrine-persistence/tests/Dummy/FindOneByCalledOnlyOnceWhenFoundRepositoryDecorator.php

@@ -13,7 +13,7 @@ class FindOneByCalledOnlyOnceWhenFoundRepositoryDecorator extends EntityReposito
     private array $calls = [];
 
     public function __construct(
-        private ObjectRepository $decorated,
+        private readonly ObjectRepository $decorated,
     ) {
     }
 

src/batch-doctrine-persistence/tests/Dummy/SimpleManagerRegistry.php

@@ -20,7 +20,7 @@ public function __construct(
         $managers = [];
         $defaultConnection = null;
         $defaultEntityManager = null;
-        foreach ($this->services as $id => $service) {
+        foreach (\array_keys($this->services) as $id) {
             $connections[] = $id;
             $managers[] = $id;
             $defaultConnection ??= $id;

src/batch-doctrine-persistence/tests/Entity/Auth/Group.php

@@ -4,18 +4,19 @@
 
 namespace Yokai\Batch\Tests\Bridge\Doctrine\Persistence\Entity\Auth;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'auth_group')]
 class Group
 {
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     #[ORM\Id]
     #[ORM\GeneratedValue]
     public int $id;
 
-    #[ORM\Column(type: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     public string $name;
 
     public function __construct(string $name)

src/batch-doctrine-persistence/tests/Entity/Auth/User.php

@@ -4,18 +4,19 @@
 
 namespace Yokai\Batch\Tests\Bridge\Doctrine\Persistence\Entity\Auth;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'auth_user')]
 class User
 {
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     #[ORM\Id]
     #[ORM\GeneratedValue]
     public int $id;
 
-    #[ORM\Column(type: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     public string $name;
 
     public function __construct(string $name)

src/batch-doctrine-persistence/tests/Entity/Shop/Product.php

@@ -4,18 +4,19 @@
 
 namespace Yokai\Batch\Tests\Bridge\Doctrine\Persistence\Entity\Shop;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'shop_product')]
 class Product
 {
-    #[ORM\Column(type: 'integer')]
+    #[ORM\Column(type: Types::INTEGER)]
     #[ORM\Id]
     #[ORM\GeneratedValue]
     public int $id;
 
-    #[ORM\Column(type: 'string')]
+    #[ORM\Column(type: Types::STRING)]
     public string $name;
 
     public function __construct(string $name)

src/batch-league-flysystem/composer.json

@@ -22,7 +22,6 @@
     },
     "require-dev": {
         "league/flysystem-memory": "^3.0",
-        "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5"
     },
     "autoload-dev": {

src/batch-league-flysystem/src/Job/CopyFilesJob.php

@@ -21,10 +21,10 @@
 class CopyFilesJob implements JobInterface
 {
     public function __construct(
-        private JobParameterAccessorInterface $location,
-        private FilesystemReader $source,
-        private FilesystemWriter $destination,
-        private Closure|null $transformLocation = null,
+        private readonly JobParameterAccessorInterface $location,
+        private readonly FilesystemReader $source,
+        private readonly FilesystemWriter $destination,
+        private readonly Closure|null $transformLocation = null,
     ) {
     }
 

src/batch-league-flysystem/src/Job/MoveFilesJob.php

@@ -22,10 +22,10 @@
 class MoveFilesJob implements JobInterface
 {
     public function __construct(
-        private JobParameterAccessorInterface $location,
-        private FilesystemOperator $source,
-        private FilesystemWriter $destination,
-        private Closure|null $transformLocation = null,
+        private readonly JobParameterAccessorInterface $location,
+        private readonly FilesystemOperator $source,
+        private readonly FilesystemWriter $destination,
+        private readonly Closure|null $transformLocation = null,
     ) {
     }
 

src/batch-league-flysystem/src/Scheduler/FileFoundScheduler.php

@@ -16,7 +16,7 @@
 /**
  * Watch for the existence of a location on a filesystem to trigger a job.
  */
-final class FileFoundScheduler implements SchedulerInterface
+final readonly class FileFoundScheduler implements SchedulerInterface
 {
     public function __construct(
         private FilesystemReader $filesystem,

src/batch-league-flysystem/tests/Dummy/CannotCheckMemoryAdapter.php

@@ -11,7 +11,7 @@
 final class CannotCheckMemoryAdapter extends InMemoryFilesystemAdapter
 {
     public function __construct(
-        private UnableToCheckExistence|FilesystemException $exception,
+        private readonly UnableToCheckExistence|FilesystemException $exception,
     ) {
         parent::__construct();
     }

src/batch-league-flysystem/tests/Dummy/CannotDeleteMemoryAdapter.php

@@ -11,7 +11,7 @@
 final class CannotDeleteMemoryAdapter extends InMemoryFilesystemAdapter
 {
     public function __construct(
-        private UnableToDeleteFile|FilesystemException $exception,
+        private readonly UnableToDeleteFile|FilesystemException $exception,
     ) {
         parent::__construct();
     }

src/batch-league-flysystem/tests/Dummy/CannotReadMemoryAdapter.php

@@ -11,7 +11,7 @@
 final class CannotReadMemoryAdapter extends InMemoryFilesystemAdapter
 {
     public function __construct(
-        private UnableToReadFile|FilesystemException $exception,
+        private readonly UnableToReadFile|FilesystemException $exception,
     ) {
         parent::__construct();
     }

src/batch-league-flysystem/tests/Dummy/CannotWriteMemoryAdapter.php

@@ -12,7 +12,7 @@
 final class CannotWriteMemoryAdapter extends InMemoryFilesystemAdapter
 {
     public function __construct(
-        private UnableToWriteFile|FilesystemException $exception,
+        private readonly UnableToWriteFile|FilesystemException $exception,
     ) {
         parent::__construct();
     }