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/zendframework/zendframework#6935-zendframework/z…
Browse files Browse the repository at this point in the history 
…endframework#6358-wrong-zend-feed-atom-datetime-format'

Close zendframework/zendframework#6935
Close zendframework/zendframework#6358
  • Loading branch information
@Ocramius
Ocramius committed Nov 27, 2014
208 parents b592ea4 + 817293e + a95715f + 59a52e7 + 1f543f2 + 8ea6767 + 8793888 + 163d706 + a197876 + dc04d82 + e296dd4 + 8cd607e + 758e5c3 + 59f3ba8 + 63d873e + a320b87 + 911d7bc + 5b99e49 + 916ccaf + 363002c + de6a155 + 81d4652 + 8677f66 + bea2340 + 53107b1 + e575de9 + c8a932b + d08629f + a04474f + 3fef53d + 1f4b9ed + d263f1c + c790aed + 412585a + b5e6b02 + 9ac81f3 + 9f28eab + 2e7e2e2 + 7c64770 + b82fa59 + 4190868 + 3a6b7ad + 8e745f6 + bab7086 + c5a5d19 + b468bc1 + d79794c + 508b344 + d16deed + f38e96a + c4a3687 + 54465f7 + 4ad15e4 + 9aa47da + 619d24d + ddfa8f2 + 8e7172b + e5fc69f + 284a721 + 6d3db4c + b99e8c3 + a52dcef + 1d21066 + cccc24c + 81bd699 + dfb38ed + b796f3d + d49dbc2 + 547433c + 0c9ce04 + a76e26a + 2914396 + 7ca3746 + f1b292d + 406112f + 5a9edd3 + f65c9f6 + c54156c + 5e55e82 + 352e42b + fa459f5 + 3eff137 + 3648ab6 + 4096125 + 0037391 + 9bdfcd9 + 6cd1498 + ecac99d + 199ed75 + b8507f7 + ef400bd + decb6ae + 860b39d + 243eca6 + d56af72 + 1aaf7f9 + 26b27a9 + 40cd50e + 986898b + d2780b7 + 49abb1d + cb5a738 + 21d3bef + 4748875 + 3331086 + bfed36c + b56e9b8 + 765b017 + b2cddce + 1c63803 + dd490e0 + c0425c2 + 128ed7f + 4d88940 + 94b3f1e + 9a0d8cf + 12135ad + 1169a58 + 6cdb5dc + 15950e5 + 7e68fb2 + 4bda4a9 + 537893f + 4cf10f8 + dd5b294 + 3ac5190 + 63d8503 + de5ff9e + f8868a0 + e3f8a27 + 634cf99 + c2cd236 + 189672f + d50054c + 8fb183a + 81a21d6 + ba78039 + 2cc9607 + bbd31f7 + aff5dfd + 3daad46 + a2bd1ba + cddc550 + eadb29a + 339c074 + 543ff20 + 732e048 + 8ec7eaf + 25fde7d + 5215c37 + a31404d + 1328e20 + 33a507b + 012928d + 379d601 + b7d4bbd + c1c633c + 6a72de0 + 7968e2e + 51d3d2a + 7e58137 + abedf39 + 896ef54 + cf89f92 + 0df0d18 + 3d7cc47 + 8abd6e8 + e20a954 + 2f039d3 + 88c06cc + 3e03422 + 096a05e + 6c7650a + a4c7b54 + ef5460e + 898d44f + c554ea2 + ffcf7bc + 2adc6bf + 4179b4d + 5907ce0 + fc664b1 + 2ee9d9a + 7fb5cbc + acda3d1 + 6db0d22 + 2bbd38f + 3144a5b + 7efb048 + 3d18a84 + 93a97aa + f98796f + 853fff2 + 149db66 + 2416664 + ed3d22e + 08c425e + 9675758 + 2a8daeb + 7e876e2 + ef2ccfa + 978f64c + 262c40f + 18ac29e + ec7ea9f + 1d789f3 + 95dfa24 + fdfe254 commit 325ca29
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/Writer/Renderer/Entry/Atom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
$this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
$this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
Expand All @@ -157,7 +157,7 @@ protected function _setDateCreated(DOMDocument $dom, DOMElement $root)
$el = $dom->createElement('published');
$root->appendChild($el);
$text = $dom->createTextNode(
$this->getDataContainer()->getDateCreated()->format(DateTime::ISO8601)
$this->getDataContainer()->getDateCreated()->format(DateTime::ATOM)
);
$el->appendChild($text);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/Renderer/Entry/Atom/Deleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function render()
$this->dom->appendChild($entry);

$entry->setAttribute('ref', $this->container->getReference());
$entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
$entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));

$this->_setBy($this->dom, $entry);
$this->_setComment($this->dom, $entry);
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/Renderer/Entry/AtomDeleted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function render()
$this->dom->appendChild($entry);

$entry->setAttribute('ref', $this->container->getReference());
$entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ISO8601));
$entry->setAttribute('when', $this->container->getWhen()->format(DateTime::ATOM));

$this->_setBy($this->dom, $entry);
$this->_setComment($this->dom, $entry);
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/Renderer/Feed/AbstractAtom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
$this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
$this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Writer/Renderer/Feed/Atom/AbstractAtom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ protected function _setDateModified(DOMDocument $dom, DOMElement $root)
$updated = $dom->createElement('updated');
$root->appendChild($updated);
$text = $dom->createTextNode(
$this->getDataContainer()->getDateModified()->format(DateTime::ISO8601)
$this->getDataContainer()->getDateModified()->format(DateTime::ATOM)
);
$updated->appendChild($text);
}
Expand Down
4 changes: 2 additions & 2 deletions test/Reader/Entry/AtomStandaloneEntryTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function testGetsDateCreatedFromAtom10()
$entry = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datecreated/atom10.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateCreated());
}

Expand All @@ -102,7 +102,7 @@ public function testGetsDateModifiedFromAtom10()
$entry = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datemodified/atom10.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateModified());
}

Expand Down
8 changes: 4 additions & 4 deletions test/Reader/Entry/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function testGetsDateCreatedFromAtom03()
file_get_contents($this->feedSamplePath . '/datecreated/plain/atom03.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateCreated());
}

Expand All @@ -100,7 +100,7 @@ public function testGetsDateCreatedFromAtom10()
file_get_contents($this->feedSamplePath . '/datecreated/plain/atom10.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateCreated());
}

Expand All @@ -123,7 +123,7 @@ public function testGetsDateModifiedFromAtom03()
file_get_contents($this->feedSamplePath . '/datemodified/plain/atom03.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateModified());
}

Expand All @@ -133,7 +133,7 @@ public function testGetsDateModifiedFromAtom10()
file_get_contents($this->feedSamplePath . '/datemodified/plain/atom10.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateModified());
}

Expand Down
4 changes: 2 additions & 2 deletions test/Reader/Feed/AtomSourceTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function testGetsDateCreatedFromAtom10()
);
$source = $feed->current()->getSource();

$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $source->getDateCreated());
}

Expand All @@ -146,7 +146,7 @@ public function testGetsDateModifiedFromAtom10()
);
$source = $feed->current()->getSource();

$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $source->getDateModified());
}

Expand Down
8 changes: 4 additions & 4 deletions test/Reader/Feed/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function testGetsDateCreatedFromAtom03()
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datecreated/plain/atom03.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $feed->getDateCreated());
}

Expand All @@ -158,7 +158,7 @@ public function testGetsDateCreatedFromAtom10()
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datecreated/plain/atom10.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $feed->getDateCreated());
}

Expand All @@ -170,7 +170,7 @@ public function testGetsDateModifiedFromAtom03()
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datemodified/plain/atom03.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $feed->getDateModified());
}

Expand All @@ -179,7 +179,7 @@ public function testGetsDateModifiedFromAtom10()
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datemodified/plain/atom10.xml')
);
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $feed->getDateModified());
}

Expand Down
15 changes: 15 additions & 0 deletions test/Writer/Renderer/Feed/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ public function testFeedEncodingHasBeenSet()
$this->assertEquals('iso-8859-1', $feed->getEncoding());
}

/**
* @group 6358
* @group 6935
*/
public function testDateModifiedHasTheCorrectFormat()
{
$date = new \DateTime();
$date->setTimestamp(1071336602);
$date->setTimezone(new \DateTimeZone('GMT'));
$this->validWriter->setDateModified($date);
$atomFeed = new Renderer\Feed\Atom($this->validWriter);
$atomFeed->render();
$this->assertEquals('2003-12-13T17:30:02+00:00', $atomFeed->getDomDocument()->getElementsByTagName('updated')->item(0)->textContent);
}

public function testFeedEncodingDefaultIsUsedIfEncodingNotSetByHand()
{
$atomFeed = new Renderer\Feed\Atom($this->validWriter);
Expand Down

0 comments on commit 325ca29

Please sign in to comment.