Skip to content

Commit

Permalink
Fix issue #451. Use atom format as suggested in the php docs for http…
Browse files Browse the repository at this point in the history
  • Loading branch information
briannesbitt committed Nov 10, 2015
1 parent 5fdd579 commit 643decd
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/Carbon/Carbon.php
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ public function toCookieString()
*/
public function toIso8601String()
{
return $this->format(static::ISO8601);
return $this->toAtomString();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Carbon/StringsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function testToCOOKIEString()
public function testToIso8601String()
{
$d = Carbon::create(1975, 12, 25, 14, 15, 16);
$this->assertSame('1975-12-25T14:15:16-0500', $d->toIso8601String());
$this->assertSame('1975-12-25T14:15:16-05:00', $d->toIso8601String());
}
public function testToRC822String()
{
Expand Down
6 changes: 3 additions & 3 deletions tests/Carbon/TestingAidsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ public function testTimeZoneWithTestValueSet()
$notNow = Carbon::parse('2013-07-01 12:00:00', 'America/New_York');
Carbon::setTestNow($notNow);

$this->assertSame('2013-07-01T12:00:00-0400', Carbon::parse('now')->toIso8601String());
$this->assertSame('2013-07-01T11:00:00-0500', Carbon::parse('now', 'America/Mexico_City')->toIso8601String());
$this->assertSame('2013-07-01T09:00:00-0700', Carbon::parse('now', 'America/Vancouver')->toIso8601String());
$this->assertSame('2013-07-01T12:00:00-04:00', Carbon::parse('now')->toIso8601String());
$this->assertSame('2013-07-01T11:00:00-05:00', Carbon::parse('now', 'America/Mexico_City')->toIso8601String());
$this->assertSame('2013-07-01T09:00:00-07:00', Carbon::parse('now', 'America/Vancouver')->toIso8601String());
}
}

0 comments on commit 643decd

Please sign in to comment.