[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

@@ -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

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;
 

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;
 

src/Reader/AbstractEntry.php

@@ -10,8 +10,8 @@
 
 namespace Zend\Feed\Reader;
 
-use DOMElement;
 use DOMDocument;
+use DOMElement;
 use DOMXPath;
 
 /**

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

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

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

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

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

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

src/Reader/Feed/FeedInterface.php

@@ -10,8 +10,8 @@
 
 namespace Zend\Feed\Reader\Feed;
 
-use Iterator;
 use Countable;
+use Iterator;
 
 /**
 * @category Zend

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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