Merge pull request #828 from TomHAnderson/feature/php-8.3

Support for PHP 8.3
doctrine · Jan 17, 2024 · fc1f8f4 · fc1f8f4
2 parents c492565 + cb29c8b
commit fc1f8f4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -13,4 +13,4 @@ jobs:
     name: "Coding Standards"
     uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
     with:
-      php-version: '8.1'
+      php-version: '8.2'
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
@@ -17,4 +17,4 @@ jobs:
     name: "Composer Lint"
     uses: "doctrine/.github/.github/workflows/composer-lint.yml@2.1.0"
     with:
-      php-version: "8.1"
+      php-version: "8.2"
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: '["8.0", "8.1", "8.2"]'
+      php-versions: '["8.0", "8.1", "8.2", "8.3"]'
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -13,4 +13,4 @@ jobs:
     name: "Static Analysis"
     uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
     with:
-      php-version: '8.1'
+      php-version: '8.2'
diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     ],
     "homepage": "http://www.doctrine-project.org/",
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+        "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
         "composer-runtime-api": "^2.0",
         "composer/semver": "^3.0",
         "doctrine/annotations": "^1.13.3 || ^2",

diff --git a/src/Form/Element/ObjectMultiCheckbox.php b/src/Form/Element/ObjectMultiCheckbox.php
@@ -11,6 +11,7 @@
 use function array_map;
 use function is_array;
 
+/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectMultiCheckbox extends MultiCheckbox
 {
     use GetProxy;
@@ -54,7 +55,7 @@ public function setValue($value)
     /**
      * {@inheritDoc}
      *
-     * @return array<array-key,mixed>
+     * @return ValueOptionSpec
      */
     public function getValueOptions(): array
     {

diff --git a/src/Form/Element/ObjectRadio.php b/src/Form/Element/ObjectRadio.php
@@ -4,8 +4,10 @@
 
 namespace DoctrineModule\Form\Element;
 
+use Laminas\Form\Element\MultiCheckbox;
 use Laminas\Form\Element\Radio as RadioElement;
 
+/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
 class ObjectRadio extends RadioElement
 {
     use GetProxy;
@@ -41,7 +43,7 @@ public function setValue($value)
     /**
      * {@inheritDoc}
      *
-     * @return array<array-key,mixed>
+     * @return ValueOptionSpec
      */
     public function getValueOptions(): array
     {