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

Commit

Permalink
Merge remote-tracking branch 'prolic/feed' into prolic-zen-52
Browse files Browse the repository at this point in the history
  • Loading branch information
@EvanDotPro
EvanDotPro committed Jun 28, 2012
77 parents e3f8a27 + 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 + c4a3687 + 469ba46 commit 63d8503
Show file tree
Hide file tree
Showing 54 changed files with 211 additions and 188 deletions.
4 changes: 2 additions & 2 deletions src/PubSubHubbub/PubSubHubbub.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\PubSubHubbub;

use Zend\Feed\Reader,
Zend\Http;
use Zend\Feed\Reader;
use Zend\Http;

/**
* @category Zend
Expand Down
4 changes: 2 additions & 2 deletions src/PubSubHubbub/Subscriber/Callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\PubSubHubbub\Subscriber;

use Zend\Feed\PubSubHubbub,
Zend\Uri;
use Zend\Feed\PubSubHubbub;
use Zend\Uri;

/**
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/AbstractEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader;

use DOMElement,
DOMDocument,
DOMXPath;
use DOMElement;
use DOMDocument;
use DOMXPath;

/**
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/AbstractFeed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader;

use DOMDocument,
DOMElement,
DOMXPath;
use DOMDocument;
use DOMElement;
use DOMXPath;

/**
* @category Zend
Expand Down
10 changes: 5 additions & 5 deletions src/Reader/Entry/AbstractEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Zend\Feed\Reader\Entry;

use Zend\Feed\Reader,
Zend\Feed\Reader\Exception,
DOMElement,
DOMDocument,
DOMXPath;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Exception;
use DOMElement;
use DOMDocument;
use DOMXPath;

/**
* @category Zend
Expand Down
7 changes: 4 additions & 3 deletions src/Reader/Entry/Atom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader\Entry;

use Zend\Feed\Reader,
DOMElement,
DOMXPath;
use Zend\Feed\Reader;
use DOMElement;
use DOMXPath;

/**
* @category Zend
Expand Down Expand Up @@ -374,6 +374,7 @@ public function getSource()
* Set the XPath query (incl. on all Extensions)
*
* @param DOMXPath $xpath
* @return void
*/
public function setXpath(DOMXPath $xpath)
{
Expand Down
13 changes: 7 additions & 6 deletions src/Reader/Entry/Rss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Zend\Feed\Reader\Entry;

use Zend\Feed\Reader,
Zend\Date,
Zend\Feed\Reader\Exception,
DOMElement,
DOMXPath;
use Zend\Feed\Reader;
use Zend\Date;
use Zend\Feed\Reader\Exception;
use DOMElement;
use DOMXPath;

/**
* @category Zend
Expand Down Expand Up @@ -228,7 +228,7 @@ public function getDateModified()
try {
$date->set($dateModified, $standard);
break;
} catch (Date\Exception $e) {
} catch (Date\Exception\ExceptionInterface $e) {
if ($standard == Date\Date::DATES) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
Expand Down Expand Up @@ -608,6 +608,7 @@ public function getCommentFeedLink()
* Set the XPath query (incl. on all Extensions)
*
* @param DOMXPath $xpath
* @return void
*/
public function setXpath(DOMXPath $xpath)
{
Expand Down
8 changes: 4 additions & 4 deletions src/Reader/Extension/AbstractEntry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

namespace Zend\Feed\Reader\Extension;

use Zend\Feed\Reader,
DOMXPath,
DOMDocument,
DOMElement;
use Zend\Feed\Reader;
use DOMXPath;
use DOMDocument;
use DOMElement;

/**
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Extension/AbstractFeed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader\Extension;

use Zend\Feed\Reader,
DOMDocument,
DOMXPath;
use Zend\Feed\Reader;
use DOMDocument;
use DOMXPath;

/**
* @category Zend
Expand Down
16 changes: 8 additions & 8 deletions src/Reader/Extension/Atom/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@

namespace Zend\Feed\Reader\Extension\Atom;

use DOMDocument,
DOMElement,
stdClass,
Zend\Date,
Zend\Feed\Reader,
Zend\Feed\Reader\Collection,
Zend\Feed\Reader\Extension,
Zend\Uri;
use DOMDocument;
use DOMElement;
use stdClass;
use Zend\Date;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Uri;

/**
* @category Zend
Expand Down
12 changes: 6 additions & 6 deletions src/Reader/Extension/Atom/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

namespace Zend\Feed\Reader\Extension\Atom;

use Zend\Date,
Zend\Feed\Reader,
Zend\Feed\Reader\Collection,
Zend\Feed\Reader\Extension,
Zend\Uri,
DOMElement;
use Zend\Date;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Uri;
use DOMElement;

/**
* @category Zend
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Extension/Content/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\Reader\Extension\Content;

use Zend\Feed\Reader,
Zend\Feed\Reader\Extension;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;

/**
* @category Zend
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Extension/CreativeCommons/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\Reader\Extension\CreativeCommons;

use Zend\Feed\Reader,
Zend\Feed\Reader\Extension;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;

/**
* @category Zend
Expand Down
10 changes: 5 additions & 5 deletions src/Reader/Extension/DublinCore/Entry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Zend\Feed\Reader\Extension\DublinCore;

use Zend\Feed\Reader,
Zend\Feed\Reader\Collection,
Zend\Feed\Reader\Extension,
Zend\Date,
DOMElement;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Date;
use DOMElement;

/**
* @category Zend
Expand Down
8 changes: 4 additions & 4 deletions src/Reader/Extension/DublinCore/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

namespace Zend\Feed\Reader\Extension\DublinCore;

use Zend\Feed\Reader,
Zend\Feed\Reader\Collection,
Zend\Feed\Reader\Extension,
Zend\Date;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Extension;
use Zend\Date;

/**
* @category Zend
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Extension/Podcast/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\Reader\Extension\Podcast;

use Zend\Feed\Reader\Extension,
DOMText;
use Zend\Feed\Reader\Extension;
use DOMText;

/**
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Extension/Syndication/Feed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader\Extension\Syndication;

use Zend\Feed\Reader,
Zend\Feed\Reader\Extension,
Zend\Date;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Extension;
use Zend\Date;

/**
* @category Zend
Expand Down
8 changes: 4 additions & 4 deletions src/Reader/Feed/AbstractFeed.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

namespace Zend\Feed\Reader\Feed;

use Zend\Feed\Reader,
Zend\Feed\Reader\Exception,
DOMXPath,
DOMDocument;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Exception;
use DOMXPath;
use DOMDocument;

/**
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/Feed/Atom.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader\Feed;

use Zend\Feed\Reader,
Zend\Date,
DOMDocument;
use Zend\Feed\Reader;
use Zend\Date;
use DOMDocument;

/**
* @category Zend
Expand Down
10 changes: 5 additions & 5 deletions src/Reader/Feed/Atom/Source.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Zend\Feed\Reader\Feed\Atom;

use Zend\Feed\Reader,
Zend\Feed\Reader\Feed,
Zend\Date,
DOMElement,
DOMXPath;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Feed;
use Zend\Date;
use DOMElement;
use DOMXPath;

/**
* @category Zend
Expand Down
4 changes: 2 additions & 2 deletions src/Reader/Feed/FeedInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

namespace Zend\Feed\Reader\Feed;

use Iterator,
Countable;
use Iterator;
use Countable;

/**
* @category Zend
Expand Down
14 changes: 7 additions & 7 deletions src/Reader/Feed/Rss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Zend\Feed\Reader\Feed;

use Zend\Feed\Reader,
Zend\Feed\Reader\Collection,
Zend\Feed\Reader\Exception,
Zend\Date,
DOMDocument;
use Zend\Feed\Reader;
use Zend\Feed\Reader\Collection;
use Zend\Feed\Reader\Exception;
use Zend\Date;
use DOMDocument;

/**
* @category Zend
Expand Down Expand Up @@ -220,7 +220,7 @@ public function getDateModified()
try {
$date->set($dateModified, $standard);
break;
} catch (Date\Exception $e) {
} catch (Date\Exception\ExceptionInterface $e) {
if ($standard == Date\Date::DATES) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
Expand Down Expand Up @@ -281,7 +281,7 @@ public function getLastBuildDate()
try {
$date->set($lastBuildDate, $standard);
break;
} catch (Date\Exception $e) {
} catch (Date\Exception\ExceptionInterface $e) {
if ($standard == Date\Date::DATES) {
throw new Exception\RuntimeException(
'Could not load date due to unrecognised'
Expand Down
6 changes: 3 additions & 3 deletions src/Reader/FeedSet.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

namespace Zend\Feed\Reader;

use ArrayObject,
DOMNodeList,
Zend\Uri;
use ArrayObject;
use DOMNodeList;
use Zend\Uri;

/**
* @category Zend
Expand Down
12 changes: 6 additions & 6 deletions src/Reader/Reader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

namespace Zend\Feed\Reader;

use Zend\Cache\Storage\StorageInterface as CacheStorage,
Zend\Http,
Zend\Loader,
Zend\Stdlib\ErrorHandler,
DOMDocument,
DOMXPath;
use Zend\Cache\Storage\StorageInterface as CacheStorage;
use Zend\Http;
use Zend\Loader;
use Zend\Stdlib\ErrorHandler;
use DOMDocument;
use DOMXPath;

/**
* @category Zend
Expand Down
Loading

0 comments on commit 63d8503

Please sign in to comment.