Skip to content

Commit 4244fd7

Browse files
authored
Merge pull request #422 from franmomu/sf7
Allow Symfony 7
2 parents 4f1c7d5 + da49c8d commit 4244fd7

4 files changed

Lines changed: 28 additions & 36 deletions

File tree

.github/workflows/tests.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
php: '7.3'
2929
dependencies: lowest
3030
-
31-
php: '8.2'
31+
php: '8.3'
3232
dependencies: highest
3333
-
3434
php: '7.3'
@@ -54,8 +54,12 @@ jobs:
5454
-
5555
php: '8.2'
5656
symfony: '6.4.*'
57-
stability: dev
58-
allow-failure: true
57+
-
58+
php: '8.3'
59+
symfony: '6.4.*'
60+
-
61+
php: '8.2'
62+
symfony: '7.0.*'
5963

6064
services:
6165
mysql:

Form/Extension/FormFlowFormExtension.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ public static function getExtendedTypes() : iterable {
2727
return [FormType::class];
2828
}
2929

30-
/**
31-
* @return void
32-
*/
33-
public function configureOptions(OptionsResolver $resolver) {
30+
public function configureOptions(OptionsResolver $resolver): void {
3431
$resolver->setDefined([
3532
'flow_instance',
3633
'flow_instance_key',
@@ -39,10 +36,7 @@ public function configureOptions(OptionsResolver $resolver) {
3936
]);
4037
}
4138

42-
/**
43-
* @return void
44-
*/
45-
public function buildForm(FormBuilderInterface $builder, array $options) {
39+
public function buildForm(FormBuilderInterface $builder, array $options): void {
4640
if (array_key_exists('flow_instance', $options) && array_key_exists('flow_instance_key', $options)) {
4741
$builder->add($options['flow_instance_key'], HiddenType::class, [
4842
'data' => $options['flow_instance'],

Form/Extension/FormFlowHiddenFieldExtension.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,14 @@ public static function getExtendedTypes() : iterable {
2727
return [HiddenType::class];
2828
}
2929

30-
/**
31-
* @return void
32-
*/
33-
public function configureOptions(OptionsResolver $resolver) {
30+
public function configureOptions(OptionsResolver $resolver): void {
3431
$resolver->setDefined([
3532
'flow_instance_key',
3633
'flow_step_key',
3734
]);
3835
}
3936

40-
/**
41-
* @return void
42-
*/
43-
public function finishView(FormView $view, FormInterface $form, array $options) {
37+
public function finishView(FormView $view, FormInterface $form, array $options): void {
4438
if (array_key_exists('flow_instance_key', $options) && $view->vars['name'] === $options['flow_instance_key']) {
4539
$view->vars['value'] = $options['data'];
4640
$view->vars['full_name'] = $options['flow_instance_key'];

composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
"homepage": "https://github.com/craue/CraueFormFlowBundle",
2323
"require": {
2424
"php": "^7.3 || ^8",
25-
"symfony/config": "^4.4 || ^5.4 || ^6.3",
26-
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.3",
27-
"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.3",
28-
"symfony/form": "^4.4 || ^5.4 || ^6.3",
29-
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.3",
30-
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.3",
31-
"symfony/options-resolver": "^4.4 || ^5.4 || ^6.3",
32-
"symfony/security-core": "^4.4 || ^5.4 || ^6.3",
33-
"symfony/translation": "^4.4 || ^5.4 || ^6.3",
34-
"symfony/validator": "^4.4 || ^5.4 || ^6.3",
35-
"symfony/yaml": "^4.4 || ^5.4 || ^6.3"
25+
"symfony/config": "^4.4 || ^5.4 || ^6.3 || ^7.0",
26+
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.3 || ^7.0",
27+
"symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.3 || ^7.0",
28+
"symfony/form": "^4.4 || ^5.4 || ^6.3 || ^7.0",
29+
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.3 || ^7.0",
30+
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.3 || ^7.0",
31+
"symfony/options-resolver": "^4.4 || ^5.4 || ^6.3 || ^7.0",
32+
"symfony/security-core": "^4.4 || ^5.4 || ^6.3 || ^7.0",
33+
"symfony/translation": "^4.4 || ^5.4 || ^6.3 || ^7.0",
34+
"symfony/validator": "^4.4 || ^5.4 || ^6.3 || ^7.0",
35+
"symfony/yaml": "^4.4 || ^5.4 || ^6.3 || ^7.0"
3636
},
3737
"require-dev": {
3838
"craue/translations-tests": "^1.1",
@@ -46,12 +46,12 @@
4646
"phpstan/phpstan-strict-rules": "^1.1",
4747
"phpstan/phpstan-symfony": "^1.1",
4848
"phpunit/phpunit": "^9.5",
49-
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.3",
50-
"symfony/css-selector": "^4.4 || ^5.4 || ^6.3",
51-
"symfony/mime": "^4.4 || ^5.4 || ^6.3",
52-
"symfony/phpunit-bridge": "^6.3",
53-
"symfony/security-bundle": "^4.4 || ^5.4 || ^6.3",
54-
"symfony/twig-bundle": "^4.4 || ^5.4 || ^6.3"
49+
"symfony/browser-kit": "^4.4 || ^5.4 || ^6.3 || ^7.0",
50+
"symfony/css-selector": "^4.4 || ^5.4 || ^6.3 || ^7.0",
51+
"symfony/mime": "^4.4 || ^5.4 || ^6.3 || ^7.0",
52+
"symfony/phpunit-bridge": "^6.3 || ^7.0",
53+
"symfony/security-bundle": "^4.4 || ^5.4 || ^6.3 || ^7.0",
54+
"symfony/twig-bundle": "^4.4 || ^5.4 || ^6.3 || ^7.0"
5555
},
5656
"conflict": {
5757
"doctrine/dbal": "<2.10"

0 commit comments

Comments
 (0)