Skip to content

Commit 43b80e1

Browse files
Merge branch '3.4' into 4.2
* 3.4: Remove "internal" annotation from datacollector serialization methods replace mocks with real objects in tests Fix phpunit 8 compatibility render integer types with grouping as text input ignore _method forms in NativeRequestHandler don't lose int precision with not needed type casts
2 parents 8d76d6e + 15e914c commit 43b80e1

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

Tests/Extension/AbstractBootstrap3LayoutTest.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1900,6 +1900,22 @@ public function testInteger()
19001900
);
19011901
}
19021902

1903+
public function testIntegerTypeWithGroupingRendersAsTextInput()
1904+
{
1905+
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\IntegerType', 123, [
1906+
'grouping' => true,
1907+
]);
1908+
1909+
$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
1910+
'/input
1911+
[@type="text"]
1912+
[@name="name"]
1913+
[@class="my&class form-control"]
1914+
[@value="123"]
1915+
'
1916+
);
1917+
}
1918+
19031919
public function testLanguage()
19041920
{
19051921
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\LanguageType', 'de');

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/asset": "~3.4|~4.0",
2525
"symfony/dependency-injection": "~3.4|~4.0",
2626
"symfony/finder": "~3.4|~4.0",
27-
"symfony/form": "^4.2.3",
27+
"symfony/form": "^4.2.4",
2828
"symfony/http-foundation": "~3.4|~4.0",
2929
"symfony/http-kernel": "~3.4|~4.0",
3030
"symfony/polyfill-intl-icu": "~1.0",
@@ -43,7 +43,7 @@
4343
},
4444
"conflict": {
4545
"symfony/console": "<3.4",
46-
"symfony/form": "<4.2.3",
46+
"symfony/form": "<4.2.4",
4747
"symfony/translation": "<4.2"
4848
},
4949
"suggest": {

0 commit comments

Comments
 (0)