Skip to content

Commit

Permalink
Merge pull request #107 from W0rma/symfony7
Browse files Browse the repository at this point in the history
Symfony 7 + PHP 8.3
  • Loading branch information
goetas authored Dec 13, 2023
2 parents 4e3a959 + 839da1e commit ccbdde8
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "highest"
- "lowest"
Expand All @@ -37,10 +38,16 @@ jobs:
symfony-require: "^6.0"
- php-version: 8.2
symfony-require: "^6.0"
- php-version: 8.3
symfony-require: "^6.0"
- php-version: 8.2
symfony-require: "^7.0"
- php-version: 8.3
symfony-require: "^7.0"

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
Expand Down
3 changes: 1 addition & 2 deletions Expression/LinkExpressionFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ class LinkExpressionFunction implements ExpressionFunctionProviderInterface
/**
* @return ExpressionFunction[]
*
* @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
* @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.UselessReturnAnnotation
*/
public function getFunctions()
public function getFunctions(): array
{
return [
new ExpressionFunction('link', static function ($object, $rel, $absolute = false) {
Expand Down
2 changes: 2 additions & 0 deletions Tests/Fixtures/SimpleObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class SimpleObject
* @Type("string")
* @SerializedName("name")
*/
#[Type('string')]
#[SerializedName('name')]
private $value;

public function __construct($value)
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
"require": {
"php": "^7.2 || ^8.0",
"jms/serializer-bundle": "^3.1 || ^4.2 || ^5.0",
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"symfony/framework-bundle": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
"symfony/framework-bundle": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
"willdurand/hateoas": "^3.5"
},
"require-dev": {
"doctrine/annotations": "^1.13.2 || ^2.0",
"doctrine/coding-standard": "^8.0",
"phpunit/phpunit": "^8.5.32 || ^9.5.10",
"symfony/stopwatch": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"twig/twig": "~1.12|~2.0"
"symfony/stopwatch": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
"twig/twig": "~1.12|~2.0|~3.0"
},
"conflict": {
"jms/serializer": "<3.18"
Expand Down

0 comments on commit ccbdde8

Please sign in to comment.