From c5a5d19043c3dcd3ddc9a3118db91fa464d42b4f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 9 Jul 2012 16:46:59 -0500 Subject: [PATCH] [zen-49] Correct import statements across framework - Ran a script that would create multiple import statements out of multi-line import statements, and which would sort all import statements in alphabetic order. Script is at https://gist.github.com/3079222 and was run by dropping into the library/Zend folder and typing (in zsh) "for file in **/*.php;do php /path/to/replace-uses.php $file; done" --- src/PubSubHubbub/AbstractCallback.php | 2 +- src/PubSubHubbub/Publisher.php | 2 +- src/PubSubHubbub/Subscriber.php | 2 +- src/Reader/AbstractEntry.php | 2 +- src/Reader/Entry/AbstractEntry.php | 6 +++--- src/Reader/Entry/Atom.php | 2 +- src/Reader/Extension/AbstractEntry.php | 4 ++-- src/Reader/Extension/AbstractFeed.php | 2 +- src/Reader/Extension/Podcast/Feed.php | 2 +- src/Reader/Feed/AbstractFeed.php | 4 ++-- src/Reader/Feed/FeedInterface.php | 2 +- src/Reader/Reader.php | 4 ++-- src/Writer/Extension/Atom/Renderer/Feed.php | 2 +- src/Writer/Extension/Content/Renderer/Entry.php | 2 +- src/Writer/Extension/DublinCore/Renderer/Entry.php | 2 +- src/Writer/Extension/DublinCore/Renderer/Feed.php | 2 +- src/Writer/Extension/ITunes/Entry.php | 3 +-- src/Writer/Extension/ITunes/Renderer/Entry.php | 2 +- src/Writer/Extension/ITunes/Renderer/Feed.php | 2 +- src/Writer/Extension/Slash/Renderer/Entry.php | 2 +- src/Writer/Extension/Threading/Renderer/Entry.php | 2 +- src/Writer/Extension/WellFormedWeb/Renderer/Entry.php | 2 +- src/Writer/Renderer/Entry/AtomDeleted.php | 2 +- src/Writer/Renderer/Feed/Atom.php | 4 ++-- src/Writer/Renderer/Feed/AtomSource.php | 6 +++--- src/Writer/Writer.php | 4 ++-- 26 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/PubSubHubbub/AbstractCallback.php b/src/PubSubHubbub/AbstractCallback.php index 39ca955e..0f85b58a 100644 --- a/src/PubSubHubbub/AbstractCallback.php +++ b/src/PubSubHubbub/AbstractCallback.php @@ -11,8 +11,8 @@ namespace Zend\Feed\PubSubHubbub; use Traversable; -use Zend\Stdlib\ArrayUtils; use Zend\Http\PhpEnvironment\Response as PhpResponse; +use Zend\Stdlib\ArrayUtils; /** * @category Zend diff --git a/src/PubSubHubbub/Publisher.php b/src/PubSubHubbub/Publisher.php index eb4fd86c..551acc33 100644 --- a/src/PubSubHubbub/Publisher.php +++ b/src/PubSubHubbub/Publisher.php @@ -11,8 +11,8 @@ namespace Zend\Feed\PubSubHubbub; use Traversable; -use Zend\Stdlib\ArrayUtils; use Zend\Http\Request as HttpRequest; +use Zend\Stdlib\ArrayUtils; use Zend\Uri; use Zend\Version; diff --git a/src/PubSubHubbub/Subscriber.php b/src/PubSubHubbub/Subscriber.php index 6077edc6..088076aa 100644 --- a/src/PubSubHubbub/Subscriber.php +++ b/src/PubSubHubbub/Subscriber.php @@ -13,8 +13,8 @@ use DateInterval; use DateTime; use Traversable; -use Zend\Stdlib\ArrayUtils; use Zend\Http\Request as HttpRequest; +use Zend\Stdlib\ArrayUtils; use Zend\Uri; use Zend\Version; diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php index fa499bd5..35e49d72 100644 --- a/src/Reader/AbstractEntry.php +++ b/src/Reader/AbstractEntry.php @@ -10,8 +10,8 @@ namespace Zend\Feed\Reader; -use DOMElement; use DOMDocument; +use DOMElement; use DOMXPath; /** diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php index 5950752f..9371f061 100644 --- a/src/Reader/Entry/AbstractEntry.php +++ b/src/Reader/Entry/AbstractEntry.php @@ -10,11 +10,11 @@ namespace Zend\Feed\Reader\Entry; -use Zend\Feed\Reader; -use Zend\Feed\Reader\Exception; -use DOMElement; use DOMDocument; +use DOMElement; use DOMXPath; +use Zend\Feed\Reader; +use Zend\Feed\Reader\Exception; /** * @category Zend diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php index 76646b01..417204d6 100644 --- a/src/Reader/Entry/Atom.php +++ b/src/Reader/Entry/Atom.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Reader\Entry; -use Zend\Feed\Reader; use DOMElement; use DOMXPath; +use Zend\Feed\Reader; /** * @category Zend diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php index e61beacd..207773c0 100644 --- a/src/Reader/Extension/AbstractEntry.php +++ b/src/Reader/Extension/AbstractEntry.php @@ -10,10 +10,10 @@ namespace Zend\Feed\Reader\Extension; -use Zend\Feed\Reader; -use DOMXPath; use DOMDocument; use DOMElement; +use DOMXPath; +use Zend\Feed\Reader; /** * @category Zend diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php index 4953784d..c219836f 100644 --- a/src/Reader/Extension/AbstractFeed.php +++ b/src/Reader/Extension/AbstractFeed.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Reader\Extension; -use Zend\Feed\Reader; use DOMDocument; use DOMXPath; +use Zend\Feed\Reader; /** * @category Zend diff --git a/src/Reader/Extension/Podcast/Feed.php b/src/Reader/Extension/Podcast/Feed.php index 0d45c52b..a79207b5 100644 --- a/src/Reader/Extension/Podcast/Feed.php +++ b/src/Reader/Extension/Podcast/Feed.php @@ -10,8 +10,8 @@ namespace Zend\Feed\Reader\Extension\Podcast; -use Zend\Feed\Reader\Extension; use DOMText; +use Zend\Feed\Reader\Extension; /** * @category Zend diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php index 51bc300d..36a2bd02 100644 --- a/src/Reader/Feed/AbstractFeed.php +++ b/src/Reader/Feed/AbstractFeed.php @@ -10,10 +10,10 @@ namespace Zend\Feed\Reader\Feed; +use DOMDocument; +use DOMXPath; use Zend\Feed\Reader; use Zend\Feed\Reader\Exception; -use DOMXPath; -use DOMDocument; /** * @category Zend diff --git a/src/Reader/Feed/FeedInterface.php b/src/Reader/Feed/FeedInterface.php index 592c5202..7da249ce 100644 --- a/src/Reader/Feed/FeedInterface.php +++ b/src/Reader/Feed/FeedInterface.php @@ -10,8 +10,8 @@ namespace Zend\Feed\Reader\Feed; -use Iterator; use Countable; +use Iterator; /** * @category Zend diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php index 52f7a43b..519ef676 100644 --- a/src/Reader/Reader.php +++ b/src/Reader/Reader.php @@ -10,12 +10,12 @@ namespace Zend\Feed\Reader; +use DOMDocument; +use DOMXPath; use Zend\Cache\Storage\StorageInterface as CacheStorage; use Zend\Http; use Zend\Loader; use Zend\Stdlib\ErrorHandler; -use DOMDocument; -use DOMXPath; /** * @category Zend diff --git a/src/Writer/Extension/Atom/Renderer/Feed.php b/src/Writer/Extension/Atom/Renderer/Feed.php index c81b969f..91a08b4f 100644 --- a/src/Writer/Extension/Atom/Renderer/Feed.php +++ b/src/Writer/Extension/Atom/Renderer/Feed.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\Atom\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/Content/Renderer/Entry.php b/src/Writer/Extension/Content/Renderer/Entry.php index 0490380a..424112de 100644 --- a/src/Writer/Extension/Content/Renderer/Entry.php +++ b/src/Writer/Extension/Content/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\Content\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/DublinCore/Renderer/Entry.php b/src/Writer/Extension/DublinCore/Renderer/Entry.php index 93c7788c..6f756c60 100644 --- a/src/Writer/Extension/DublinCore/Renderer/Entry.php +++ b/src/Writer/Extension/DublinCore/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\DublinCore\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/DublinCore/Renderer/Feed.php b/src/Writer/Extension/DublinCore/Renderer/Feed.php index 1b969aa2..81c9f056 100644 --- a/src/Writer/Extension/DublinCore/Renderer/Feed.php +++ b/src/Writer/Extension/DublinCore/Renderer/Feed.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\DublinCore\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php index 33c719ca..de62da19 100644 --- a/src/Writer/Extension/ITunes/Entry.php +++ b/src/Writer/Extension/ITunes/Entry.php @@ -9,9 +9,8 @@ */ namespace Zend\Feed\Writer\Extension\ITunes; -use Zend\Feed\Writer\Extension; use Zend\Feed\Writer; - +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/ITunes/Renderer/Entry.php b/src/Writer/Extension/ITunes/Renderer/Entry.php index 195c20b8..33410ceb 100644 --- a/src/Writer/Extension/ITunes/Renderer/Entry.php +++ b/src/Writer/Extension/ITunes/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\ITunes\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/ITunes/Renderer/Feed.php b/src/Writer/Extension/ITunes/Renderer/Feed.php index 9cba799f..32186a86 100644 --- a/src/Writer/Extension/ITunes/Renderer/Feed.php +++ b/src/Writer/Extension/ITunes/Renderer/Feed.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\ITunes\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/Slash/Renderer/Entry.php b/src/Writer/Extension/Slash/Renderer/Entry.php index 1a9528a0..694ef070 100644 --- a/src/Writer/Extension/Slash/Renderer/Entry.php +++ b/src/Writer/Extension/Slash/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\Slash\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/Threading/Renderer/Entry.php b/src/Writer/Extension/Threading/Renderer/Entry.php index 26c69370..61bfa117 100644 --- a/src/Writer/Extension/Threading/Renderer/Entry.php +++ b/src/Writer/Extension/Threading/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\Threading\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php index 9bbbd59b..814d815e 100644 --- a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php +++ b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Extension\WellFormedWeb\Renderer; -use Zend\Feed\Writer\Extension; use DOMDocument; use DOMElement; +use Zend\Feed\Writer\Extension; /** * @category Zend diff --git a/src/Writer/Renderer/Entry/AtomDeleted.php b/src/Writer/Renderer/Entry/AtomDeleted.php index 782cfcc9..1ac0e1fb 100644 --- a/src/Writer/Renderer/Entry/AtomDeleted.php +++ b/src/Writer/Renderer/Entry/AtomDeleted.php @@ -13,8 +13,8 @@ use DateTime; use DOMDocument; use DOMElement; -use Zend\Feed\Writer\Renderer; use Zend\Feed\Writer; +use Zend\Feed\Writer\Renderer; /** * @category Zend diff --git a/src/Writer/Renderer/Feed/Atom.php b/src/Writer/Renderer/Feed/Atom.php index d1721446..aa687fd6 100644 --- a/src/Writer/Renderer/Feed/Atom.php +++ b/src/Writer/Renderer/Feed/Atom.php @@ -10,9 +10,9 @@ namespace Zend\Feed\Writer\Renderer\Feed; -use Zend\Feed\Writer\Renderer; -use Zend\Feed\Writer; use DOMDocument; +use Zend\Feed\Writer; +use Zend\Feed\Writer\Renderer; /** * @category Zend diff --git a/src/Writer/Renderer/Feed/AtomSource.php b/src/Writer/Renderer/Feed/AtomSource.php index 0f9e0214..f0659403 100644 --- a/src/Writer/Renderer/Feed/AtomSource.php +++ b/src/Writer/Renderer/Feed/AtomSource.php @@ -10,10 +10,10 @@ namespace Zend\Feed\Writer\Renderer\Feed; -use Zend\Feed\Writer\Renderer; -use Zend\Feed\Writer; -use DOMElement; use DOMDocument; +use DOMElement; +use Zend\Feed\Writer; +use Zend\Feed\Writer\Renderer; /** * @category Zend diff --git a/src/Writer/Writer.php b/src/Writer/Writer.php index 967c5d03..3d47bd70 100644 --- a/src/Writer/Writer.php +++ b/src/Writer/Writer.php @@ -10,10 +10,10 @@ namespace Zend\Feed\Writer; -use Zend\Loader\ShortNameLocator; +use Zend\Loader\Exception\PluginLoaderException; use Zend\Loader\PrefixPathLoader; use Zend\Loader\PrefixPathMapper; -use Zend\Loader\Exception\PluginLoaderException; +use Zend\Loader\ShortNameLocator; /** * @category Zend