Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Hotfix for #5912: wrong datetime select form element cloning logic #5913

Closed
wants to merge 2 commits into from
Closed

Hotfix for #5912: wrong datetime select form element cloning logic #5913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09cece5
Test case for #5912 - cloning of DateTimeSelectElement is corrupting …
Ocramius Mar 5, 2014
9fb1207
Hotfix for #5912 as suggested by @MeKeyCool
Ocramius Mar 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/Zend/Form/Element/DateTimeSelect.php
View file
Open in desktop
Expand Up @@ -319,7 +319,7 @@ public function __clone()
$this->dayElement = clone $this->dayElement;
$this->monthElement = clone $this->monthElement;
$this->yearElement = clone $this->yearElement;
$this->hourElement = clone $this->monthElement;
$this->hourElement = clone $this->hourElement;
$this->minuteElement = clone $this->minuteElement;
$this->secondElement = clone $this->secondElement;
}
Expand Down
15 changes: 15 additions & 0 deletions tests/ZendTest/Form/Element/DateTimeSelectTest.php
View file
Open in desktop
Expand Up @@ -114,4 +114,19 @@ public function testUseDefaultValueForSecondsIfNotProvided()
$this->assertEquals('04', $element->getMinuteElement()->getValue());
$this->assertEquals('00', $element->getSecondElement()->getValue());
}

public function testCloningPreservesCorrectValues()
{
$element = new DateTimeSelectElement();
$element->setValue(new DateTime('2014-01-02 03:04:05'));

$cloned = clone $element;

$this->assertEquals('2014', $cloned->getYearElement()->getValue());
$this->assertEquals('01', $cloned->getMonthElement()->getValue());
$this->assertEquals('02', $cloned->getDayElement()->getValue());
$this->assertEquals('03', $cloned->getHourElement()->getValue());
$this->assertEquals('04', $cloned->getMinuteElement()->getValue());
$this->assertEquals('05', $cloned->getSecondElement()->getValue());
}
}