Skip to content

Commit 4987925

Browse files
MAGETWO-35656: \Magento\Framework\Stdlib\DateTime\DateTime methods malformed
1 parent fc7273d commit 4987925

File tree

2 files changed

+33
-1
lines changed

2 files changed

+33
-1
lines changed

lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function gmtTimestamp($input = null)
114114
return false;
115115
}
116116
$date = $this->_localeDate->date($result);
117-
$timestamp = $date->getTimestamp() - $date->getTimezone()->getOffset($date);
117+
$timestamp = $date->getTimestamp();
118118
unset($date);
119119
return $timestamp;
120120
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Framework\Stdlib\Test\Unit\DateTime;
7+
8+
use \Magento\Framework\Stdlib\DateTime\DateTime;
9+
10+
/**
11+
* Magento\Framework\Stdlib\DateTimeTest test case
12+
*/
13+
class DateTimeTest extends \PHPUnit_Framework_TestCase
14+
{
15+
/**
16+
* @test
17+
*/
18+
public function testGmtTimestamp()
19+
{
20+
$timezone = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')->getMock();
21+
$timezone->expects($this->any())
22+
->method('date')
23+
->willReturn(new \DateTime('2015-04-02 21:03:00'));
24+
/** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone */
25+
26+
$dateTime = new DateTime($timezone);
27+
$this->assertEquals(
28+
gmdate('U', strtotime('2015-04-02 21:03:00')),
29+
$dateTime->gmtTimestamp('2015-04-02 21:03:00')
30+
);
31+
}
32+
}

0 commit comments

Comments
 (0)