Skip to content

Commit

Permalink
Merge pull request #828 from TomHAnderson/feature/php-8.3
Browse files Browse the repository at this point in the history
Support for PHP 8.3
  • Loading branch information
driehle authored Jan 17, 2024
2 parents c492565 + cb29c8b commit fc1f8f4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: '8.1'
php-version: '8.2'
2 changes: 1 addition & 1 deletion .github/workflows/composer-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
name: "Composer Lint"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: "8.1"
php-version: "8.2"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: "PHPUnit"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-versions: '["8.0", "8.1", "8.2"]'
php-versions: '["8.0", "8.1", "8.2", "8.3"]'
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/[email protected]"
with:
php-version: '8.1'
php-version: '8.2'
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/Form/Element/ObjectMultiCheckbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use function array_map;
use function is_array;

/** @psalm-import-type ValueOptionSpec from MultiCheckbox */
class ObjectMultiCheckbox extends MultiCheckbox
{
use GetProxy;
Expand Down Expand Up @@ -54,7 +55,7 @@ public function setValue($value)
/**
* {@inheritDoc}
*
* @return array<array-key,mixed>
* @return ValueOptionSpec
*/
public function getValueOptions(): array
{
Expand Down
4 changes: 3 additions & 1 deletion src/Form/Element/ObjectRadio.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -41,7 +43,7 @@ public function setValue($value)
/**
* {@inheritDoc}
*
* @return array<array-key,mixed>
* @return ValueOptionSpec
*/
public function getValueOptions(): array
{
Expand Down

0 comments on commit fc1f8f4

Please sign in to comment.