Merge pull request #791 from fezfez/php8.2

Add support for PHP 8.2
doctrine · Dec 8, 2022 · a970728 · a970728
2 parents 80ecc80 + 3234770
commit a970728
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -13,4 +13,4 @@ jobs:
     name: "PHPUnit"
     uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0"
     with:
-      php-versions: '["7.4", "8.0", "8.1"]'
+      php-versions: '["7.4", "8.0", "8.1", "8.2"]'
diff --git a/composer.json b/composer.json
@@ -36,14 +36,14 @@
     ],
     "homepage": "http://www.doctrine-project.org/",
     "require": {
-        "php": "^7.4 || ~8.0.0 || ~8.1.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
         "doctrine/annotations": "^1.13.3",
         "doctrine/cache": "^1.13.0",
         "doctrine/collections": "^1.8.0",
-        "doctrine/doctrine-laminas-hydrator": "^3.0.0",
-        "doctrine/event-manager": "^1.1.1",
+        "doctrine/doctrine-laminas-hydrator": "^3.2.0",
+        "doctrine/event-manager": "^1.2.0",
         "doctrine/inflector": "^2.0.6",
-        "doctrine/persistence": "^2.5.5 || ^3.0.4",
+        "doctrine/persistence": "^2.5.5 || ^3.1.0",
         "laminas/laminas-authentication": "^2.12.0",
         "laminas/laminas-cache": "^3.6.0",
         "laminas/laminas-eventmanager": "^3.5.0",
@@ -55,21 +55,21 @@
         "laminas/laminas-stdlib": "^3.13.0",
         "laminas/laminas-validator": "^2.25.0",
         "psr/container": "^1.1.2",
-        "symfony/console": "^5.4.15 || ^6.1.7"
+        "symfony/console": "^5.4.16 || ^6.2.1"
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0.2",
         "doctrine/mongodb-odm": "^2.4.2",
-        "doctrine/orm": "^2.13.3",
+        "doctrine/orm": "^2.13.4",
         "jangregor/phpstan-prophecy": "^1.0.0",
         "laminas/laminas-cache-storage-adapter-blackhole": "^2.0.0",
-        "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
+        "laminas/laminas-cache-storage-adapter-memory": "^2.1.0",
         "laminas/laminas-i18n": "^2.17.0",
         "laminas/laminas-log": "^2.15.3",
         "laminas/laminas-serializer": "^2.13.0",
         "laminas/laminas-session": "^2.13.0",
         "phpstan/phpstan": "^1.9.2",
-        "phpstan/phpstan-phpunit": "^1.2.2",
+        "phpstan/phpstan-phpunit": "^1.3.0",
         "phpunit/phpunit": "^9.5.26",
         "predis/predis": "^1.1.10",
         "vimeo/psalm": "^4.30.0"

diff --git a/src/Paginator/Adapter/Selectable.php b/src/Paginator/Adapter/Selectable.php
@@ -13,8 +13,8 @@
 /**
  * Provides a wrapper around a Selectable object
  *
- * @psalm-template TKey of array-key
- * @psalm-template T
+ * @template TKey of int
+ * @template T
  */
 class Selectable implements AdapterInterface
 {
@@ -38,7 +38,7 @@ public function __construct(DoctrineSelectable $selectable, ?Criteria $criteria
     /**
      * {@inheritDoc}
      *
-     * @return array<TKey,T>
+     * @return iterable<TKey,T>
      */
     public function getItems($offset, $itemCountPerPage)
     {