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

Commit

Permalink
Merge branch 'feature/3951' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#3951
  • Loading branch information
@weierophinney
weierophinney committed Mar 12, 2013
170 parents 2ee9d9a + 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 + 7fb5cbc + acda3d1 + 08153af commit a320b87
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 10 deletions.
6 changes: 3 additions & 3 deletions src/Reader/Extension/Atom/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

namespace Zend\Feed\Reader\Extension\Atom;

use DateTime;
use DOMDocument;
use DOMElement;
use stdClass;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Stdlib\DateTime;
use Zend\Uri;

class Entry extends Extension\AbstractEntry
Expand Down Expand Up @@ -170,7 +170,7 @@ public function getDateCreated()
}

if ($dateCreated) {
$date = DateTime::createFromISO8601($dateCreated);
$date = new DateTime($dateCreated);
}

$this->data['datecreated'] = $date;
Expand Down Expand Up @@ -198,7 +198,7 @@ public function getDateModified()
}

if ($dateModified) {
$date = DateTime::createFromISO8601($dateModified);
$date = new DateTime($dateModified);
}

$this->data['datemodified'] = $date;
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Extension/Atom/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

namespace Zend\Feed\Reader\Extension\Atom;

use DateTime;
use DOMElement;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Stdlib\DateTime;
use Zend\Uri;

class Feed extends Extension\AbstractFeed
Expand Down Expand Up @@ -120,7 +120,7 @@ public function getDateCreated()
}

if ($dateCreated) {
$date = DateTime::createFromISO8601($dateCreated);
$date = new DateTime($dateCreated);
}

$this->data['datecreated'] = $date;
Expand Down Expand Up @@ -148,7 +148,7 @@ public function getDateModified()
}

if ($dateModified) {
$date = DateTime::createFromISO8601($dateModified);
$date = new DateTime($dateModified);
}

$this->data['datemodified'] = $date;
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Extension/DublinCore/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

namespace Zend\Feed\Reader\Extension\DublinCore;

use DateTime;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Stdlib\DateTime;

class Entry extends Extension\AbstractEntry
{
Expand Down Expand Up @@ -217,7 +217,7 @@ public function getDate()
}

if ($date) {
$d = DateTime::createFromISO8601($date);
$d = new DateTime($date);
}

$this->data['date'] = $d;
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Extension/DublinCore/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

namespace Zend\Feed\Reader\Extension\DublinCore;

use DateTime;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Stdlib\DateTime;

class Feed extends Extension\AbstractFeed
{
Expand Down Expand Up @@ -226,7 +226,7 @@ public function getDate()
}

if ($date) {
$d = DateTime::createFromISO8601($date);
$d = new DateTime($date);
}

$this->data['date'] = $d;
Expand Down
20 changes: 20 additions & 0 deletions test/Reader/Entry/AtomTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,16 @@ public function testGetsDateCreatedFromAtom10()
$this->assertEquals($edate, $entry->getDateCreated());
}

public function testGetsDateCreatedWithFractional()
{
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datecreated/plain/fractional.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateCreated());
}

/**
* Get modification date (Unencoded Text)
*/
Expand All @@ -132,6 +142,16 @@ public function testGetsDateModifiedFromAtom10()
$this->assertEquals($edate, $entry->getDateModified());
}

public function testGetsDateModifiedWithFractional()
{
$feed = Reader\Reader::importString(
file_get_contents($this->feedSamplePath . '/datemodified/plain/fractional.xml')
);
$entry = $feed->current();
$edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
$this->assertEquals($edate, $entry->getDateModified());
}

/**
* Get Title (Unencoded Text)
*/
Expand Down
6 changes: 6 additions & 0 deletions test/Reader/Entry/_files/Atom/datecreated/plain/fractional.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<feed version="0.3" xmlns="http://purl.org/atom/ns#">
<entry>
<created>2009-03-07T08:03:50.80Z</created>
</entry>
</feed>
6 changes: 6 additions & 0 deletions test/Reader/Entry/_files/Atom/datemodified/plain/fractional.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<feed version="0.3" xmlns="http://purl.org/atom/ns#">
<entry>
<modified>2009-03-07T08:03:50.80Z</modified>
</entry>
</feed>

0 comments on commit a320b87

Please sign in to comment.