Skip to content

Commit

Permalink
Merge pull request #329 from W0rma/symfony7
Browse files Browse the repository at this point in the history
Allow Symfony 7
  • Loading branch information
goetas authored Dec 12, 2023
2 parents 39bae03 + 43e1576 commit 5d7953f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
- "8.0"
- "8.1"
- "8.2"
- "8.3"
dependencies:
- "highest"
- "lowest"
Expand All @@ -36,10 +37,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
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"doctrine/annotations": "^1.13.2 || ^2.0",
"jms/metadata": "^2.0",
"jms/serializer": "^3.18.2",
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0"
"symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0"
},
"require-dev": {
"phpunit/phpunit": "^7 | ^9.5.10",
Expand All @@ -31,8 +31,8 @@
"phpdocumentor/type-resolver": "^1.5.1",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpspec/prophecy": "^1.16",
"symfony/routing": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"symfony/yaml": "~3.0 || ~4.0 || ~5.0 || ~6.0",
"symfony/routing": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
"symfony/yaml": "~3.0 || ~4.0 || ~5.0 || ~6.0 || ~7.0",
"twig/twig": "^1.43 || ^2.13 || ^3.0"
},
"suggest": {
Expand Down
2 changes: 1 addition & 1 deletion src/Expression/LinkExpressionFunction.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class LinkExpressionFunction implements ExpressionFunctionProviderInterface
*
* @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
*/
public function getFunctions()
public function getFunctions(): array
{
return [
new ExpressionFunction('link', static function ($object, $rel, $absolute = false) {
Expand Down

0 comments on commit 5d7953f

Please sign in to comment.