bug #41000 [Form] Use !isset for checks cause this doesn't falsely include 0 (Kai Dederichs)
This PR was submitted for the 5.2 branch but it was squashed and merged into the 4.4 branch instead.
Discussion
----------
[Form] Use !isset for checks cause this doesn't falsely include 0
| Q | A
| ------------- | ---
| Branch? | 5.2
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | Fix #40999
| License | MIT
By using isset 0 won't falsely included anymore
Commits
-------
cd541c5a63
[Form] Use !isset for checks cause this doesn't falsely include 0
This commit is contained in:
commit
9b89b2ec04
@ -170,9 +170,9 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
|
|||||||
empty($value['year']) ? $this->referenceDate->format('Y') : $value['year'],
|
empty($value['year']) ? $this->referenceDate->format('Y') : $value['year'],
|
||||||
empty($value['month']) ? $this->referenceDate->format('m') : $value['month'],
|
empty($value['month']) ? $this->referenceDate->format('m') : $value['month'],
|
||||||
empty($value['day']) ? $this->referenceDate->format('d') : $value['day'],
|
empty($value['day']) ? $this->referenceDate->format('d') : $value['day'],
|
||||||
empty($value['hour']) ? $this->referenceDate->format('H') : $value['hour'],
|
$value['hour'] ?? $this->referenceDate->format('H'),
|
||||||
empty($value['minute']) ? $this->referenceDate->format('i') : $value['minute'],
|
$value['minute'] ?? $this->referenceDate->format('i'),
|
||||||
empty($value['second']) ? $this->referenceDate->format('s') : $value['second']
|
$value['second'] ?? $this->referenceDate->format('s')
|
||||||
),
|
),
|
||||||
new \DateTimeZone($this->outputTimezone)
|
new \DateTimeZone($this->outputTimezone)
|
||||||
);
|
);
|
||||||
|
@ -204,6 +204,32 @@ class DateTypeTest extends BaseTypeTest
|
|||||||
$this->assertEquals('02.06.2010', $form->getViewData());
|
$this->assertEquals('02.06.2010', $form->getViewData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testArrayDateWithReferenceDoesUseReferenceTimeOnZero()
|
||||||
|
{
|
||||||
|
// we test against "de_DE", so we need the full implementation
|
||||||
|
IntlTestHelper::requireFullIntl($this, false);
|
||||||
|
|
||||||
|
\Locale::setDefault('de_DE');
|
||||||
|
|
||||||
|
$input = [
|
||||||
|
'day' => '0',
|
||||||
|
'month' => '0',
|
||||||
|
'year' => '0',
|
||||||
|
];
|
||||||
|
|
||||||
|
$form = $this->factory->create(static::TESTED_TYPE, $input, [
|
||||||
|
'format' => \IntlDateFormatter::MEDIUM,
|
||||||
|
'html5' => false,
|
||||||
|
'model_timezone' => 'UTC',
|
||||||
|
'view_timezone' => 'Europe/Berlin',
|
||||||
|
'input' => 'array',
|
||||||
|
'widget' => 'single_text',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertSame($input, $form->getData());
|
||||||
|
$this->assertEquals('01.01.1970', $form->getViewData());
|
||||||
|
}
|
||||||
|
|
||||||
public function testSubmitFromText()
|
public function testSubmitFromText()
|
||||||
{
|
{
|
||||||
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
@ -969,6 +969,28 @@ class TimeTypeTest extends BaseTypeTest
|
|||||||
$this->assertSame($expectedData, $form->getData());
|
$this->assertSame($expectedData, $form->getData());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testArrayTimeWithReferenceDoesNotUseReferenceTimeOnZero()
|
||||||
|
{
|
||||||
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
'model_timezone' => 'UTC',
|
||||||
|
'view_timezone' => 'Europe/Berlin',
|
||||||
|
'reference_date' => new \DateTimeImmutable('01-01-2021 12:34:56', new \DateTimeZone('UTC')),
|
||||||
|
'input' => 'array',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$input = [
|
||||||
|
'hour' => '0',
|
||||||
|
'minute' => '0',
|
||||||
|
];
|
||||||
|
$form->submit($input);
|
||||||
|
|
||||||
|
$this->assertEquals([
|
||||||
|
'hour' => '23',
|
||||||
|
'minute' => '0',
|
||||||
|
], $form->getData());
|
||||||
|
$this->assertSame($input, $form->getViewData());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dataProvider provideEmptyData
|
* @dataProvider provideEmptyData
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user