Skip to content

Commit 5f18f54

Browse files
Merge branch '2.8' into 3.4
* 2.8: KernelInterface can return null container [Ldap] Use shut up operator on connection errors at ldap_start_tls [HttpFoundation] don't override StreamedResponse::setNotModified() Added relevent links for parsing to the phpdoc Add stricter checking for valid date time string [Form] Fix DateTimeType html5 input format
2 parents 7f1c652 + 69d2a55 commit 5f18f54

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Extension/AbstractBootstrap3LayoutTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ public function testDateTimeWithWidgetSingleText()
15601560
[@type="datetime-local"]
15611561
[@name="name"]
15621562
[@class="my&class form-control"]
1563-
[@value="2011-02-03T04:05:06Z"]
1563+
[@value="2011-02-03T04:05:06"]
15641564
'
15651565
);
15661566
}
@@ -1581,7 +1581,7 @@ public function testDateTimeWithWidgetSingleTextIgnoreDateAndTimeWidgets()
15811581
[@type="datetime-local"]
15821582
[@name="name"]
15831583
[@class="my&class form-control"]
1584-
[@value="2011-02-03T04:05:06Z"]
1584+
[@value="2011-02-03T04:05:06"]
15851585
'
15861586
);
15871587
}

0 commit comments

Comments
 (0)