Skip to content

Commit 33acf4a

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: remove superfluous cast Change 'cache_key' to AbstractRendererEngine::CACHE_KEY_VAR Upgrade PHPUnit to 8.5 (php 7.2) and 9.3 (php >= 7.3).
2 parents 44965c5 + 00764b9 commit 33acf4a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Extension/Core/Type/BaseType.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Extension\Core\Type;
1313

14+
use Symfony\Component\Form\AbstractRendererEngine;
1415
use Symfony\Component\Form\AbstractType;
1516
use Symfony\Component\Form\FormBuilderInterface;
1617
use Symfony\Component\Form\FormInterface;
@@ -111,7 +112,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
111112
// collection form have different types (dynamically), they should
112113
// be rendered differently.
113114
// https://github.com/symfony/symfony/issues/5038
114-
'cache_key' => $uniqueBlockPrefix.'_'.$form->getConfig()->getType()->getBlockPrefix(),
115+
AbstractRendererEngine::CACHE_KEY_VAR => $uniqueBlockPrefix.'_'.$form->getConfig()->getType()->getBlockPrefix(),
115116
]);
116117
}
117118

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"require-dev": {
2929
"doctrine/collections": "~1.0",
30-
"symfony/validator": "^3.4.31|^4.3.4|^5.0",
30+
"symfony/validator": "^3.4.44|^4.3.4|^5.0",
3131
"symfony/dependency-injection": "^3.4|^4.0|^5.0",
3232
"symfony/expression-language": "^3.4|^4.0|^5.0",
3333
"symfony/config": "^3.4|^4.0|^5.0",

0 commit comments

Comments
 (0)