Merge pull request #728 from rogervila/php-82-support

PHP 8.2 Support

Author: driehle

.github/workflows/coding-standards.yml

@@ -13,4 +13,4 @@ jobs:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.5.1"
     with:
-      php-version: '8.1'
+      php-version: '8.2'

.github/workflows/continuous-integration.yml

@@ -20,6 +20,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         dbal-version:
           - "2.13.0"
           - "3.3.0"

.github/workflows/static-analysis.yml

@@ -13,4 +13,4 @@ jobs:
     name: "Static Analysis"
     uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.5.1"
     with:
-      php-version: '8.1'
+      php-version: '8.2'

composer.json

@@ -49,11 +49,11 @@
         }
     },
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0",
         "ext-json": "*",
         "doctrine/dbal": "^2.13.7 || ^3.3.2",
         "doctrine/doctrine-laminas-hydrator": "^3.0.0",
-        "doctrine/doctrine-module": "^5.2.0",
+        "doctrine/doctrine-module": "^5.3.0",
         "doctrine/event-manager": "^1.1.1",
         "doctrine/orm": "^2.11.1",
         "doctrine/persistence": "^2.3.0 || ^3.0.0",

phpstan.neon

@@ -15,6 +15,9 @@ parameters:
         -
             message: '#Parameter \#1 .* of method DoctrineORMModule\\Options\\Configuration.* stdClass given#'
             path: tests/Options/ConfigurationOptionsTest.php
+        -
+            message: '#Parameter \#1 .* of method Doctrine\\Common\\DataFixtures\\Executor\\ORMExecutor::execute\(\)#'
+            path: tests/Paginator/AdapterTest.php
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
 

psalm.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="4"
-    phpVersion="8.0"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

src/CliConfigurator.php

@@ -129,6 +129,7 @@ private function getObjectManagerName(): string
             return $this->defaultObjectManagerName;
         }
 
+        /** @psalm-suppress ReservedWord */
         return $arguments->getParameterOption('--object-manager');
     }
 

src/Module.php

@@ -50,6 +50,7 @@ static function (EventInterface $event): void {
             ->getEventManager()
             ->attach(
                 ProfilerEvent::EVENT_PROFILER_INIT,
+                /** @param EventInterface $event */
                 static function ($event): void {
                     $container = $event->getTarget()->getParam('ServiceManager');
                     $container->get('doctrine.sql_logger_collector.orm_default');

src/Paginator/Adapter/DoctrinePaginator.php

@@ -52,7 +52,12 @@ public function getPaginator(): Paginator
     /**
      * {@inheritDoc}
      *
-     * @psalm-return ArrayIterator<TKey, TValue>
+     * @param int|null $offset
+     * @param int|null $itemCountPerPage
+     *
+     * @return ArrayIterator<TKey, TValue>
+     *
+     * @psalm-suppress LessSpecificImplementedReturnType
      */
     public function getItems($offset, $itemCountPerPage)
     {
@@ -70,7 +75,7 @@ public function count(): int
     }
 
     /**
-     * @return array{select: string, count_select: int}
+     * @return array{select: list<string>|string, count_select: int}
      */
     public function jsonSerialize(): array
     {

src/Service/ConfigurationFactory.php

@@ -23,6 +23,8 @@ final class ConfigurationFactory extends DoctrineConfigurationFactory
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return Configuration
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/DBALConfigurationFactory.php

@@ -33,6 +33,8 @@ public function __construct(string $name)
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return Configuration
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/DBALConnectionFactory.php

@@ -25,6 +25,8 @@ final class DBALConnectionFactory extends AbstractFactory
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return Connection
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/EntityManagerAliasCompatFactory.php

@@ -19,6 +19,8 @@ final class EntityManagerAliasCompatFactory implements FactoryInterface
      * @deprecated this method was introduced to allow aliasing of service `Doctrine\ORM\EntityManager`
      *             from `doctrine.entitymanager.orm_default`
      *
+     * @param string $requestedName
+     *
      * @return EntityManager
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/EntityManagerFactory.php

@@ -16,6 +16,8 @@ final class EntityManagerFactory extends AbstractFactory
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return EntityManager
      */
     public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)

src/Service/MappingCollectorFactory.php

@@ -17,6 +17,8 @@ final class MappingCollectorFactory extends AbstractFactory
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return MappingCollector
      */
     public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)

src/Service/MigrationsCommandFactory.php

@@ -53,6 +53,8 @@ public function __construct(string $name)
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return DoctrineCommand
      *
      * @throws InvalidArgumentException
@@ -109,6 +111,7 @@ private function getObjectManagerName(): string
             return $this->defaultObjectManagerName;
         }
 
+        /** @psalm-suppress ReservedWord */
         return $arguments->getParameterOption('--object-manager');
     }
 }

src/Service/ObjectMultiCheckboxFactory.php

@@ -17,6 +17,8 @@ final class ObjectMultiCheckboxFactory implements FactoryInterface
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return ObjectMultiCheckbox
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/ObjectRadioFactory.php

@@ -17,6 +17,8 @@ final class ObjectRadioFactory implements FactoryInterface
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return ObjectRadio
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)

src/Service/ObjectSelectFactory.php

@@ -17,6 +17,8 @@ final class ObjectSelectFactory implements FactoryInterface
     /**
      * {@inheritDoc}
      *
+     * @param string $requestedName
+     *
      * @return ObjectSelect
      */
     public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)