Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit be6d2c2

Browse filesBrowse files
committed
Merge branch '2.3' into 2.7
* 2.3: [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes [Debug] Fix handling of php7 throwables [Process] remove dead code [ClassLoader] Fix storing not-found classes in APC cache [Form] cs fixes in date types
2 parents 2e72aa0 + 08c85cc commit be6d2c2
Copy full SHA for be6d2c2

File tree

Expand file treeCollapse file tree

3 files changed

+5
-5
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+5
-5
lines changed

‎Extension/Core/Type/DateTimeType.php

Copy file name to clipboardExpand all lines: Extension/Core/Type/DateTimeType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
203203
public function configureOptions(OptionsResolver $resolver)
204204
{
205205
$compound = function (Options $options) {
206-
return $options['widget'] !== 'single_text';
206+
return 'single_text' !== $options['widget'];
207207
};
208208

209209
// Defaults to the value of "widget"

‎Extension/Core/Type/DateType.php

Copy file name to clipboardExpand all lines: Extension/Core/Type/DateType.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
7878
$pattern
7979
);
8080

81-
// new \intlDateFormatter may return null instead of false in case of failure, see https://bugs.php.net/bug.php?id=66323
81+
// new \IntlDateFormatter may return null instead of false in case of failure, see https://bugs.php.net/bug.php?id=66323
8282
if (!$formatter) {
8383
throw new InvalidOptionsException(intl_get_error_message(), intl_get_error_code());
8484
}
@@ -175,7 +175,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
175175
public function configureOptions(OptionsResolver $resolver)
176176
{
177177
$compound = function (Options $options) {
178-
return $options['widget'] !== 'single_text';
178+
return 'single_text' !== $options['widget'];
179179
};
180180

181181
$placeholder = $placeholderDefault = function (Options $options) {
@@ -206,7 +206,7 @@ public function configureOptions(OptionsResolver $resolver)
206206
};
207207

208208
$format = function (Options $options) {
209-
return $options['widget'] === 'single_text' ? DateType::HTML5_FORMAT : DateType::DEFAULT_FORMAT;
209+
return 'single_text' === $options['widget'] ? DateType::HTML5_FORMAT : DateType::DEFAULT_FORMAT;
210210
};
211211

212212
$resolver->setDefaults(array(

‎Extension/Core/Type/TimeType.php

Copy file name to clipboardExpand all lines: Extension/Core/Type/TimeType.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
163163
public function configureOptions(OptionsResolver $resolver)
164164
{
165165
$compound = function (Options $options) {
166-
return $options['widget'] !== 'single_text';
166+
return 'single_text' !== $options['widget'];
167167
};
168168

169169
$placeholder = $placeholderDefault = function (Options $options) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.