From ef6b1d4f1f71c96676ef4632612edb69d5c64558 Mon Sep 17 00:00:00 2001 From: W0rma Date: Mon, 11 Dec 2023 16:25:06 +0100 Subject: [PATCH 1/4] Allow installation of symfony 7 --- .github/workflows/ci.yaml | 2 ++ composer.json | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index eeed973..8d46743 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,6 +36,8 @@ jobs: symfony-require: "^6.0" - php-version: 8.2 symfony-require: "^6.0" + - php-version: 8.2 + symfony-require: "^7.0" steps: - name: Checkout code diff --git a/composer.json b/composer.json index 370f410..3ba7d6b 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -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": { From c3cfdc124afd3c589fa09df254c77a5c739975aa Mon Sep 17 00:00:00 2001 From: W0rma Date: Mon, 11 Dec 2023 16:25:46 +0100 Subject: [PATCH 2/4] Test against PHP 8.3 --- .github/workflows/ci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8d46743..96240ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,6 +22,7 @@ jobs: - "8.0" - "8.1" - "8.2" + - "8.3" dependencies: - "highest" - "lowest" @@ -36,8 +37,12 @@ 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 From 0008a26f7c14f0d5d2aab6cb46b3af02de085729 Mon Sep 17 00:00:00 2001 From: W0rma Date: Mon, 11 Dec 2023 16:29:20 +0100 Subject: [PATCH 3/4] Add return type for compatibility with symfony 7 --- src/Expression/LinkExpressionFunction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Expression/LinkExpressionFunction.php b/src/Expression/LinkExpressionFunction.php index b40ef4e..7cdfa04 100644 --- a/src/Expression/LinkExpressionFunction.php +++ b/src/Expression/LinkExpressionFunction.php @@ -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) { From 43e1576dff281a8eac7fb6205f1bccab01c6a697 Mon Sep 17 00:00:00 2001 From: W0rma Date: Mon, 11 Dec 2023 16:31:46 +0100 Subject: [PATCH 4/4] Bump action/checkout version --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 96240ed..5467a43 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -46,7 +46,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: "Install PHP" uses: "shivammathur/setup-php@v2"