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

Commit

Permalink
Merge branch 'hotfix/3019' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Nov 20, 2012
2 parents a0d7134 + 0279494 commit 7e455b4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/View/Helper/DateFormatTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,15 @@ public function testDefaultLocale()
{
$this->assertEquals(Locale::getDefault(), $this->helper->getLocale());
}

public function testBugTwoPatternOnSameHelperInstance()
{
$date = new DateTime('2012-07-02T22:44:03Z');
$helper = new DateFormatHelper();
$date = new DateTime('2012-07-02T22:44:03Z');

$helper = new DateFormatHelper();
$helper->setTimezone('Europe/Berlin');
$this->assertEquals('03/2012', $helper->__invoke($date, null, null, 'it_IT', 'dd/Y'));
$this->assertEquals('03-2012', $helper->__invoke($date, null, null, 'it_IT', 'dd-Y'));
$this->assertEquals('03/2012', $helper->__invoke($date, null, null, 'it_IT', 'dd/Y'));
$this->assertEquals('03-2012', $helper->__invoke($date, null, null, 'it_IT', 'dd-Y'));
}

public function assertMbStringEquals($expected, $test, $message = '')
Expand Down

0 comments on commit 7e455b4

Please sign in to comment.