diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI][Form] Fixed test suite (TimeType changes & unresolved merge conflict)

Browse Source
This commit is contained in:
Wouter de Jong 2020-03-15 13:01:42 +01:00 committed by Fabien Potencier
parent 14f2d22158
commit 18f5b17249
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -994,13 +994,8 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
$id = (string) $id;
<<<<<<< HEAD
if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
=======
if ('' === $id || '\\' === substr($id, -1) || \strlen($id) !== strcspn($id, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid service id: "%s".', $id));
>>>>>>> 3.4
}
unset($this->aliasDefinitions[$id], $this->removedIds[$id]);

4
src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
View File

@ -60,8 +60,6 @@ class TimeType extends AbstractType
}
if ('single_text' === $options['widget']) {
$builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) {
$data = $e->getData();
if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {
@ -86,6 +84,8 @@ class TimeType extends AbstractType
}
});
}
$builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
} else {
$hourOptions = $minuteOptions = $secondOptions = [
'error_bubbling' => true,