8000 Merge branch '3.4' into 4.4 · symfony/symfony@ee0f5a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit ee0f5a2

Browse files
fabpotfabpot
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 cae08a0 + 6b8857c commit ee0f5a2

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

‎phpunit

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
1212
if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
1313
putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
1414
}
15-
if (\PHP_VERSION_ID >= 80000) {
16-
putenv('SYMFONY_PHPUNIT_VERSION=9.3');
15+
if (\PHP_VERSION_ID < 70300) {
16+
putenv('SYMFONY_PHPUNIT_VERSION=8.5');
1717
} else {
18-
putenv('SYMFONY_PHPUNIT_VERSION=8.3');
18+
putenv('SYMFONY_PHPUNIT_VERSION=9.3');
1919
}
2020
} elseif (\PHP_VERSION_ID >= 70000) {
2121
putenv('SYMFONY_PHPUNIT_VERSION=6.5');

‎src/Symfony/Component/Form/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

‎src/Symfony/Component/Form/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",

‎src/Symfony/Component/Yaml/Parser.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ private function parseValue(string $value, int $flags, string $context)
720720
if (\in_array($value[0], ['!', '|', '>'], true) && self::preg_match('/^(?:'.self::TAG_PATTERN.' +)?'.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
721721
$modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
722722

723-
$data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs((int) $modifiers));
723+
$data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), abs((int) $modifiers));
724724

725725
if ('' !== $matches['tag'] && '!' !== $matches['tag']) {
726726
if ('!!binary' === $matches['tag']) {

0 commit comments

Comments
 (0)
0