Skip to content

Commit 4831d3c

Browse files
committed
Merge branch '3.2'
* 3.2: (40 commits) fixed CS fixed CS fixed CS fixer config fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [Cache] Fix tags expiration [PhpUnit] Blacklist DeprecationErrorHandler in stack traces [PropertyInfo] Don't try to access a property thru a static method [PropertyInfo] Exclude static methods form properties guessing [Workflow] Added new validator to make sure each place has unique translation names [Cache] [PdoAdapter] Fix MySQL 1170 error (blob as primary key) [FrameworkBundle] Fix third level headers for MarkdownDescriptor [Ldap] Using Ldap stored username instead of form submitted one [Ldap] load users with the good username case ...
2 parents 918d732 + 59fe91a commit 4831d3c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Extension/Core/Type/DateType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public function configureOptions(OptionsResolver $resolver)
212212
array('year' => $default, 'month' => $default, 'day' => $default),
213213
$choiceTranslationDomain
214214
);
215-
};
215+
}
216216

217217
return array(
218218
'year' => $choiceTranslationDomain,

Extension/Core/Type/TimeType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function configureOptions(OptionsResolver $resolver)
213213
array('hour' => $default, 'minute' => $default, 'second' => $default),
214214
$choiceTranslationDomain
215215
);
216-
};
216+
}
217217

218218
return array(
219219
'hour' => $choiceTranslationDomain,

0 commit comments

Comments
 (0)