diff --git a/composer.json b/composer.json
index 637f7e6f..ace0259a 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.23",
         "zendframework/zend-escaper": "self.version",
         "zendframework/zend-stdlib": "self.version"
     },
@@ -36,8 +36,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.2-dev",
-            "dev-develop": "2.3-dev"
+            "dev-master": "2.3-dev",
+            "dev-develop": "2.4-dev"
         }
     },
     "autoload-dev": {
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
index 34ab7187..ef0173a5 100644
--- a/src/Exception/BadMethodCallException.php
+++ b/src/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
index f4cf0a0b..8abcfa9e 100644
--- a/src/Exception/ExceptionInterface.php
+++ b/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 09930c9b..c601ef63 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
index 27a32c6b..824a6db4 100644
--- a/src/Exception/RuntimeException.php
+++ b/src/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/AbstractCallback.php b/src/PubSubHubbub/AbstractCallback.php
index b3ab1907..7645cb90 100644
--- a/src/PubSubHubbub/AbstractCallback.php
+++ b/src/PubSubHubbub/AbstractCallback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/CallbackInterface.php b/src/PubSubHubbub/CallbackInterface.php
index 050c2746..8873c3db 100644
--- a/src/PubSubHubbub/CallbackInterface.php
+++ b/src/PubSubHubbub/CallbackInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Exception/ExceptionInterface.php b/src/PubSubHubbub/Exception/ExceptionInterface.php
index 75d710cd..845ae2cd 100644
--- a/src/PubSubHubbub/Exception/ExceptionInterface.php
+++ b/src/PubSubHubbub/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Exception/InvalidArgumentException.php b/src/PubSubHubbub/Exception/InvalidArgumentException.php
index 0b2339f1..23f8df10 100644
--- a/src/PubSubHubbub/Exception/InvalidArgumentException.php
+++ b/src/PubSubHubbub/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Exception/RuntimeException.php b/src/PubSubHubbub/Exception/RuntimeException.php
index 23e15441..209842bd 100644
--- a/src/PubSubHubbub/Exception/RuntimeException.php
+++ b/src/PubSubHubbub/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/HttpResponse.php b/src/PubSubHubbub/HttpResponse.php
index d820cf9f..0c4c7417 100644
--- a/src/PubSubHubbub/HttpResponse.php
+++ b/src/PubSubHubbub/HttpResponse.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Model/AbstractModel.php b/src/PubSubHubbub/Model/AbstractModel.php
index 023fe8ed..92e68813 100644
--- a/src/PubSubHubbub/Model/AbstractModel.php
+++ b/src/PubSubHubbub/Model/AbstractModel.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Model/Subscription.php b/src/PubSubHubbub/Model/Subscription.php
index a7a4596b..9571106a 100644
--- a/src/PubSubHubbub/Model/Subscription.php
+++ b/src/PubSubHubbub/Model/Subscription.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
index 717591b0..77b2e71f 100644
--- a/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
+++ b/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/PubSubHubbub.php b/src/PubSubHubbub/PubSubHubbub.php
index 1d941426..585be54d 100644
--- a/src/PubSubHubbub/PubSubHubbub.php
+++ b/src/PubSubHubbub/PubSubHubbub.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -95,7 +95,7 @@ public static function getHttpClient()
 
     /**
      * Simple mechanism to delete the entire singleton HTTP Client instance
-     * which forces an new instantiation for subsequent requests.
+     * which forces a new instantiation for subsequent requests.
      *
      * @return void
      */
diff --git a/src/PubSubHubbub/Publisher.php b/src/PubSubHubbub/Publisher.php
index 0156b638..916ffcad 100644
--- a/src/PubSubHubbub/Publisher.php
+++ b/src/PubSubHubbub/Publisher.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Subscriber.php b/src/PubSubHubbub/Subscriber.php
index 7171694d..265fe776 100644
--- a/src/PubSubHubbub/Subscriber.php
+++ b/src/PubSubHubbub/Subscriber.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Subscriber/Callback.php b/src/PubSubHubbub/Subscriber/Callback.php
index 4e15e58d..5ec8af2f 100644
--- a/src/PubSubHubbub/Subscriber/Callback.php
+++ b/src/PubSubHubbub/Subscriber/Callback.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/PubSubHubbub/Version.php b/src/PubSubHubbub/Version.php
index 026fe3b9..edee6953 100644
--- a/src/PubSubHubbub/Version.php
+++ b/src/PubSubHubbub/Version.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index 797562ea..cf8a9361 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index 6a5cee33..57ed45d3 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Collection.php b/src/Reader/Collection.php
index 32144dfa..172eecce 100644
--- a/src/Reader/Collection.php
+++ b/src/Reader/Collection.php
@@ -3,15 +3,15 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Feed\Reader;
 
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
 
+class Collection extends ArrayObject
+{
 
 }
diff --git a/src/Reader/Collection/AbstractCollection.php b/src/Reader/Collection/AbstractCollection.php
index 8c64ec99..2466a0a9 100644
--- a/src/Reader/Collection/AbstractCollection.php
+++ b/src/Reader/Collection/AbstractCollection.php
@@ -3,13 +3,15 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Feed\Reader\Collection;
 
-abstract class AbstractCollection extends \ArrayObject
+use ArrayObject;
+
+abstract class AbstractCollection extends ArrayObject
 {
 
     /**
diff --git a/src/Reader/Collection/Author.php b/src/Reader/Collection/Author.php
index 15aa3283..1c773d02 100644
--- a/src/Reader/Collection/Author.php
+++ b/src/Reader/Collection/Author.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Collection/Category.php b/src/Reader/Collection/Category.php
index 2739bc83..15112cea 100644
--- a/src/Reader/Collection/Category.php
+++ b/src/Reader/Collection/Category.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Collection/Collection.php b/src/Reader/Collection/Collection.php
index 820a695a..e3a6ae3d 100644
--- a/src/Reader/Collection/Collection.php
+++ b/src/Reader/Collection/Collection.php
@@ -3,15 +3,15 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
 namespace Zend\Feed\Reader\Collection;
 
-class Collection extends \ArrayObject
-{
-
+use ArrayObject;
 
+class Collection extends ArrayObject
+{
 
 }
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index 68ff4f94..241a8cdb 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index fcd5f60f..ed61a21e 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Entry/EntryInterface.php b/src/Reader/Entry/EntryInterface.php
index 29b437a2..86fea3ec 100644
--- a/src/Reader/Entry/EntryInterface.php
+++ b/src/Reader/Entry/EntryInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index 274d0d58..27337b1b 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Exception/BadMethodCallException.php b/src/Reader/Exception/BadMethodCallException.php
index 3994b0ce..ee1ef94c 100644
--- a/src/Reader/Exception/BadMethodCallException.php
+++ b/src/Reader/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Exception/ExceptionInterface.php b/src/Reader/Exception/ExceptionInterface.php
index 09abac6d..8fc904ae 100644
--- a/src/Reader/Exception/ExceptionInterface.php
+++ b/src/Reader/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Exception/InvalidArgumentException.php b/src/Reader/Exception/InvalidArgumentException.php
index 5860322a..ad7e928d 100644
--- a/src/Reader/Exception/InvalidArgumentException.php
+++ b/src/Reader/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Exception/RuntimeException.php b/src/Reader/Exception/RuntimeException.php
index f0590fb4..706a4858 100644
--- a/src/Reader/Exception/RuntimeException.php
+++ b/src/Reader/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index 0f0333b9..15e7574d 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index 75089253..1bea2e49 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index d68577cd..aa91a5c9 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
index 83e9ccae..986d23fd 100644
--- a/src/Reader/Extension/Atom/Feed.php
+++ b/src/Reader/Extension/Atom/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Content/Entry.php b/src/Reader/Extension/Content/Entry.php
index 88fd850b..f48a360f 100644
--- a/src/Reader/Extension/Content/Entry.php
+++ b/src/Reader/Extension/Content/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/CreativeCommons/Entry.php b/src/Reader/Extension/CreativeCommons/Entry.php
index 0352102c..6770b4fe 100644
--- a/src/Reader/Extension/CreativeCommons/Entry.php
+++ b/src/Reader/Extension/CreativeCommons/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/CreativeCommons/Feed.php b/src/Reader/Extension/CreativeCommons/Feed.php
index d2a50496..103bce7f 100644
--- a/src/Reader/Extension/CreativeCommons/Feed.php
+++ b/src/Reader/Extension/CreativeCommons/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index 7ec5304e..2713353c 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index 61959c4a..2738ac73 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Podcast/Entry.php b/src/Reader/Extension/Podcast/Entry.php
index 584fd375..c97e64ff 100644
--- a/src/Reader/Extension/Podcast/Entry.php
+++ b/src/Reader/Extension/Podcast/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Podcast/Feed.php b/src/Reader/Extension/Podcast/Feed.php
index b80bec9c..66b13a48 100644
--- a/src/Reader/Extension/Podcast/Feed.php
+++ b/src/Reader/Extension/Podcast/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Slash/Entry.php b/src/Reader/Extension/Slash/Entry.php
index abd7eda9..2c47568f 100644
--- a/src/Reader/Extension/Slash/Entry.php
+++ b/src/Reader/Extension/Slash/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/Syndication/Feed.php b/src/Reader/Extension/Syndication/Feed.php
index 75f031b2..db1724c1 100644
--- a/src/Reader/Extension/Syndication/Feed.php
+++ b/src/Reader/Extension/Syndication/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -13,7 +13,7 @@
 use Zend\Feed\Reader;
 use Zend\Feed\Reader\Extension;
 
-class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
+class Feed extends Extension\AbstractFeed
 {
     /**
      * Get update period
@@ -24,7 +24,7 @@ class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
     public function getUpdatePeriod()
     {
         $name = 'updatePeriod';
-        $period = $this->_getData($name);
+        $period = $this->getData($name);
 
         if ($period === null) {
             $this->data[$name] = 'daily';
@@ -46,12 +46,13 @@ public function getUpdatePeriod()
 
     /**
      * Get update frequency
+     *
      * @return int
      */
     public function getUpdateFrequency()
     {
         $name = 'updateFrequency';
-        $freq = $this->_getData($name, 'number');
+        $freq = $this->getData($name, 'number');
 
         if (!$freq || $freq < 1) {
             $this->data[$name] = 1;
@@ -63,12 +64,13 @@ public function getUpdateFrequency()
 
     /**
      * Get update frequency as ticks
+     *
      * @return int
      */
     public function getUpdateFrequencyAsTicks()
     {
         $name = 'updateFrequency';
-        $freq = $this->_getData($name, 'number');
+        $freq = $this->getData($name, 'number');
 
         if (!$freq || $freq < 1) {
             $this->data[$name] = 1;
@@ -105,7 +107,7 @@ public function getUpdateFrequencyAsTicks()
      */
     public function getUpdateBase()
     {
-        $updateBase = $this->_getData('updateBase');
+        $updateBase = $this->getData('updateBase');
         $date = null;
         if ($updateBase) {
             $date = DateTime::createFromFormat(DateTime::W3C, $updateBase);
@@ -120,7 +122,7 @@ public function getUpdateBase()
      * @param string $type
      * @return mixed|null
      */
-    private function _getData($name, $type = 'string')
+    private function getData($name, $type = 'string')
     {
         if (array_key_exists($name, $this->data)) {
             return $this->data[$name];
diff --git a/src/Reader/Extension/Thread/Entry.php b/src/Reader/Extension/Thread/Entry.php
index ceaee85b..d3bc3158 100644
--- a/src/Reader/Extension/Thread/Entry.php
+++ b/src/Reader/Extension/Thread/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Extension/WellFormedWeb/Entry.php b/src/Reader/Extension/WellFormedWeb/Entry.php
index cc52bc90..6d5a9770 100644
--- a/src/Reader/Extension/WellFormedWeb/Entry.php
+++ b/src/Reader/Extension/WellFormedWeb/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/ExtensionManager.php b/src/Reader/ExtensionManager.php
index b6fa68db..9103643a 100644
--- a/src/Reader/ExtensionManager.php
+++ b/src/Reader/ExtensionManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/ExtensionManagerInterface.php b/src/Reader/ExtensionManagerInterface.php
index 6ae9b679..4bbb91d9 100644
--- a/src/Reader/ExtensionManagerInterface.php
+++ b/src/Reader/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/ExtensionPluginManager.php b/src/Reader/ExtensionPluginManager.php
index 8222ee2c..45d3b26b 100644
--- a/src/Reader/ExtensionPluginManager.php
+++ b/src/Reader/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 64381840..0d5f2b83 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index cc394385..251ad03c 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -383,7 +383,6 @@ protected function indexEntries()
     {
         if ($this->getType() == Reader\Reader::TYPE_ATOM_10 ||
             $this->getType() == Reader\Reader::TYPE_ATOM_03) {
-            $entries = array();
             $entries = $this->xpath->evaluate('//atom:entry');
 
             foreach ($entries as $index => $entry) {
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index 3055dc32..fada1285 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Feed/FeedInterface.php b/src/Reader/Feed/FeedInterface.php
index c66bb7bf..4ba3293d 100644
--- a/src/Reader/Feed/FeedInterface.php
+++ b/src/Reader/Feed/FeedInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 61ce229b..fc7baa13 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -675,8 +675,6 @@ public function getCategories()
      */
     protected function indexEntries()
     {
-        $entries = array();
-
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $entries = $this->xpath->evaluate('//item');
         } else {
diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index c9476208..a432ac3b 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Http/ClientInterface.php b/src/Reader/Http/ClientInterface.php
index dc0f5f69..43932f76 100644
--- a/src/Reader/Http/ClientInterface.php
+++ b/src/Reader/Http/ClientInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Http/ResponseInterface.php b/src/Reader/Http/ResponseInterface.php
index 5027f200..39c51724 100644
--- a/src/Reader/Http/ResponseInterface.php
+++ b/src/Reader/Http/ResponseInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 7f8a25c2..bcd387ad 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -192,7 +192,6 @@ public static function import($uri, $etag = null, $lastModified = null)
     {
         $cache       = self::getCache();
         $feed        = null;
-        $responseXml = '';
         $client      = self::getHttpClient();
         $client->resetParameters();
         $headers = new ZendHttp\Headers();
@@ -266,7 +265,7 @@ public static function import($uri, $etag = null, $lastModified = null)
      * HTTP client implementations.
      *
      * @param  string $uri
-     * @param  Http\Client $client
+     * @param  Http\ClientInterface $client
      * @return self
      * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
      */
@@ -299,6 +298,11 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client)
      */
     public static function importString($string)
     {
+        $trimmed = trim($string);
+        if (!is_string($string) || empty($trimmed)) {
+            throw new Exception\InvalidArgumentException('Only non empty strings are allowed as input');
+        }
+
         $libxmlErrflag = libxml_use_internal_errors(true);
         $oldValue = libxml_disable_entity_loader(true);
         $dom = new DOMDocument;
diff --git a/src/Uri.php b/src/Uri.php
index c2403c5b..940bce11 100644
--- a/src/Uri.php
+++ b/src/Uri.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
index 389a987d..5165904f 100644
--- a/src/Writer/AbstractFeed.php
+++ b/src/Writer/AbstractFeed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -287,7 +287,6 @@ protected function _validateTagUri($id)
     {
         if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
             $dvalid = false;
-            $nvalid = false;
             $date = $matches['date'];
             $d6 = strtotime($date);
             if ((strlen($date) == 4) && $date <= date('Y')) {
diff --git a/src/Writer/Deleted.php b/src/Writer/Deleted.php
index b9ff3212..b4a6567a 100644
--- a/src/Writer/Deleted.php
+++ b/src/Writer/Deleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
index 88a6fea3..af8cf7a1 100644
--- a/src/Writer/Entry.php
+++ b/src/Writer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -11,7 +11,6 @@
 
 use DateTime;
 use Zend\Feed\Uri;
-use Zend\Feed\Writer\Exception;
 
 /**
 */
@@ -531,7 +530,7 @@ public function getCommentFeedLinks()
     }
 
     /**
-     * Add a entry category
+     * Add an entry category
      *
      * @param array $category
      * @throws Exception\InvalidArgumentException
diff --git a/src/Writer/Exception/BadMethodCallException.php b/src/Writer/Exception/BadMethodCallException.php
index e969d219..e0385118 100644
--- a/src/Writer/Exception/BadMethodCallException.php
+++ b/src/Writer/Exception/BadMethodCallException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Exception/ExceptionInterface.php b/src/Writer/Exception/ExceptionInterface.php
index dbcd2796..c2ed59be 100644
--- a/src/Writer/Exception/ExceptionInterface.php
+++ b/src/Writer/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Exception/InvalidArgumentException.php b/src/Writer/Exception/InvalidArgumentException.php
index 971eead3..377d378d 100644
--- a/src/Writer/Exception/InvalidArgumentException.php
+++ b/src/Writer/Exception/InvalidArgumentException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Exception/RuntimeException.php b/src/Writer/Exception/RuntimeException.php
index 2c37bdaf..6de3df50 100644
--- a/src/Writer/Exception/RuntimeException.php
+++ b/src/Writer/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/AbstractRenderer.php b/src/Writer/Extension/AbstractRenderer.php
index 7927e735..5e4eb8c8 100644
--- a/src/Writer/Extension/AbstractRenderer.php
+++ b/src/Writer/Extension/AbstractRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/Atom/Renderer/Feed.php b/src/Writer/Extension/Atom/Renderer/Feed.php
index 1d7023e3..f7902595 100644
--- a/src/Writer/Extension/Atom/Renderer/Feed.php
+++ b/src/Writer/Extension/Atom/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/Content/Renderer/Entry.php b/src/Writer/Extension/Content/Renderer/Entry.php
index 8785fb73..6d64bc2f 100644
--- a/src/Writer/Extension/Content/Renderer/Entry.php
+++ b/src/Writer/Extension/Content/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/DublinCore/Renderer/Entry.php b/src/Writer/Extension/DublinCore/Renderer/Entry.php
index fffefd54..d7ca4fda 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Entry.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/DublinCore/Renderer/Feed.php b/src/Writer/Extension/DublinCore/Renderer/Feed.php
index ceb3fac3..e888fbd0 100644
--- a/src/Writer/Extension/DublinCore/Renderer/Feed.php
+++ b/src/Writer/Extension/DublinCore/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
index f136293e..1b7b64aa 100644
--- a/src/Writer/Extension/ITunes/Entry.php
+++ b/src/Writer/Extension/ITunes/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php
index 7e6c5ac5..22c54db6 100644
--- a/src/Writer/Extension/ITunes/Feed.php
+++ b/src/Writer/Extension/ITunes/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/ITunes/Renderer/Entry.php b/src/Writer/Extension/ITunes/Renderer/Entry.php
index b46d10c5..bc57d1da 100644
--- a/src/Writer/Extension/ITunes/Renderer/Entry.php
+++ b/src/Writer/Extension/ITunes/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/ITunes/Renderer/Feed.php b/src/Writer/Extension/ITunes/Renderer/Feed.php
index 9799681a..d5b56578 100644
--- a/src/Writer/Extension/ITunes/Renderer/Feed.php
+++ b/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/RendererInterface.php b/src/Writer/Extension/RendererInterface.php
index 032313d6..e72346c2 100644
--- a/src/Writer/Extension/RendererInterface.php
+++ b/src/Writer/Extension/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/Slash/Renderer/Entry.php b/src/Writer/Extension/Slash/Renderer/Entry.php
index 80adb515..cb08828c 100644
--- a/src/Writer/Extension/Slash/Renderer/Entry.php
+++ b/src/Writer/Extension/Slash/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/Threading/Renderer/Entry.php b/src/Writer/Extension/Threading/Renderer/Entry.php
index ee66b8f2..bbf4595e 100644
--- a/src/Writer/Extension/Threading/Renderer/Entry.php
+++ b/src/Writer/Extension/Threading/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
index f5da0b0d..be13b71d 100644
--- a/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
+++ b/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/ExtensionManager.php b/src/Writer/ExtensionManager.php
index 0bb4ce0f..77d49a0d 100644
--- a/src/Writer/ExtensionManager.php
+++ b/src/Writer/ExtensionManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -60,7 +60,7 @@ public function __call($method, $args)
      * Get the named extension
      *
      * @param  string $name
-     * @return Extension\AbstractEntry|Extension\AbstractFeed
+     * @return Extension\AbstractRenderer
      */
     public function get($name)
     {
diff --git a/src/Writer/ExtensionManagerInterface.php b/src/Writer/ExtensionManagerInterface.php
index 358e187a..0f7e023f 100644
--- a/src/Writer/ExtensionManagerInterface.php
+++ b/src/Writer/ExtensionManagerInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/ExtensionPluginManager.php b/src/Writer/ExtensionPluginManager.php
index 575794eb..1155c84d 100644
--- a/src/Writer/ExtensionPluginManager.php
+++ b/src/Writer/ExtensionPluginManager.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php
index 0922082c..99f2698a 100644
--- a/src/Writer/Feed.php
+++ b/src/Writer/Feed.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -11,7 +11,6 @@
 
 use Countable;
 use Iterator;
-use Zend\Feed\Writer\Renderer;
 
 /**
 */
diff --git a/src/Writer/FeedFactory.php b/src/Writer/FeedFactory.php
index 9cf8fbae..15e7a346 100644
--- a/src/Writer/FeedFactory.php
+++ b/src/Writer/FeedFactory.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Renderer/AbstractRenderer.php b/src/Writer/Renderer/AbstractRenderer.php
index f981f49a..e1045019 100644
--- a/src/Writer/Renderer/AbstractRenderer.php
+++ b/src/Writer/Renderer/AbstractRenderer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Renderer/Entry/Atom.php b/src/Writer/Renderer/Entry/Atom.php
index 1758f4ff..c7fc4be2 100644
--- a/src/Writer/Renderer/Entry/Atom.php
+++ b/src/Writer/Renderer/Entry/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -24,7 +24,7 @@ class Atom extends Renderer\AbstractRenderer implements Renderer\RendererInterfa
      *
      * @param  Writer\Entry $container
      */
-    public function __construct (Writer\Entry $container)
+    public function __construct(Writer\Entry $container)
     {
         parent::__construct($container);
     }
@@ -291,7 +291,6 @@ protected function _validateTagUri($id)
     {
         if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
             $dvalid = false;
-            $nvalid = false;
             $date = $matches['date'];
             $d6 = strtotime($date);
             if ((strlen($date) == 4) && $date <= date('Y')) {
@@ -353,7 +352,6 @@ protected function _setContent(DOMDocument $dom, DOMElement $root)
      */
     protected function _loadXhtml($content)
     {
-        $xhtml = '';
         if (class_exists('tidy', false)) {
             $tidy = new \tidy;
             $config = array(
diff --git a/src/Writer/Renderer/Entry/Atom/Deleted.php b/src/Writer/Renderer/Entry/Atom/Deleted.php
index 679b6c48..65ace00b 100644
--- a/src/Writer/Renderer/Entry/Atom/Deleted.php
+++ b/src/Writer/Renderer/Entry/Atom/Deleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -12,17 +12,17 @@
 use DateTime;
 use DOMDocument;
 use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
 
-class Deleted
-    extends \Zend\Feed\Writer\Renderer\AbstractRenderer
-    implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Deleted extends Renderer\AbstractRenderer implements Renderer\RendererInterface
 {
     /**
      * Constructor
      *
-     * @param  \Zend\Feed\Writer\Deleted $container
+     * @param  Writer\Deleted $container
      */
-    public function __construct (\Zend\Feed\Writer\Deleted $container)
+    public function __construct(Writer\Deleted $container)
     {
         parent::__construct($container);
     }
@@ -30,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Deleted $container)
     /**
      * Render atom entry
      *
-     * @return \Zend\Feed\Writer\Renderer\Entry\Atom
+     * @return Writer\Renderer\Entry\Atom
      */
     public function render()
     {
diff --git a/src/Writer/Renderer/Entry/AtomDeleted.php b/src/Writer/Renderer/Entry/AtomDeleted.php
index fd12eef5..1ed4aa3d 100644
--- a/src/Writer/Renderer/Entry/AtomDeleted.php
+++ b/src/Writer/Renderer/Entry/AtomDeleted.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -24,7 +24,7 @@ class AtomDeleted extends Renderer\AbstractRenderer implements Renderer\Renderer
      *
      * @param  Writer\Deleted $container
      */
-    public function __construct (Writer\Deleted $container)
+    public function __construct(Writer\Deleted $container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/Entry/Rss.php b/src/Writer/Renderer/Entry/Rss.php
index 8d352c9c..2338cdc2 100644
--- a/src/Writer/Renderer/Entry/Rss.php
+++ b/src/Writer/Renderer/Entry/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -25,7 +25,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      *
      * @param  Writer\Entry $container
      */
-    public function __construct (Writer\Entry $container)
+    public function __construct(Writer\Entry $container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/Feed/AbstractAtom.php b/src/Writer/Renderer/Feed/AbstractAtom.php
index 2ff11129..e7ad9f56 100644
--- a/src/Writer/Renderer/Feed/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Renderer/Feed/Atom.php b/src/Writer/Renderer/Feed/Atom.php
index 78abdd55..87b6b94a 100644
--- a/src/Writer/Renderer/Feed/Atom.php
+++ b/src/Writer/Renderer/Feed/Atom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -22,7 +22,7 @@ class Atom extends AbstractAtom implements Renderer\RendererInterface
      *
      * @param  Writer\Feed $container
      */
-    public function __construct (Writer\Feed $container)
+    public function __construct(Writer\Feed $container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
index a36dab28..379cd5c9 100644
--- a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
+++ b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -22,7 +22,7 @@ class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
      *
      * @param  \Zend\Feed\Writer\Feed $container
      */
-    public function __construct ($container)
+    public function __construct($container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/Feed/Atom/Source.php b/src/Writer/Renderer/Feed/Atom/Source.php
index f9fbf2d9..006c6ae4 100644
--- a/src/Writer/Renderer/Feed/Atom/Source.php
+++ b/src/Writer/Renderer/Feed/Atom/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -11,16 +11,18 @@
 
 use DOMDocument;
 use DOMElement;
+use Zend\Feed\Writer;
+use Zend\Feed\Writer\Renderer;
 
-class Source extends AbstractAtom implements \Zend\Feed\Writer\Renderer\RendererInterface
+class Source extends AbstractAtom implements Renderer\RendererInterface
 {
 
     /**
      * Constructor
      *
-     * @param  \Zend\Feed\Writer\Source $container
+     * @param  Writer\Source $container
      */
-    public function __construct (\Zend\Feed\Writer\Source $container)
+    public function __construct(Writer\Source $container)
     {
         parent::__construct($container);
     }
@@ -28,7 +30,7 @@ public function __construct (\Zend\Feed\Writer\Source $container)
     /**
      * Render Atom Feed Metadata (Source element)
      *
-     * @return \Zend\Feed\Writer\Renderer\Feed\Atom
+     * @return Writer\Renderer\Feed\Atom
      */
     public function render()
     {
diff --git a/src/Writer/Renderer/Feed/AtomSource.php b/src/Writer/Renderer/Feed/AtomSource.php
index de9654c5..739c6f72 100644
--- a/src/Writer/Renderer/Feed/AtomSource.php
+++ b/src/Writer/Renderer/Feed/AtomSource.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -24,7 +24,7 @@ class AtomSource extends AbstractAtom implements Renderer\RendererInterface
      *
      * @param  Writer\Source $container
      */
-    public function __construct (Writer\Source $container)
+    public function __construct(Writer\Source $container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/Feed/Rss.php b/src/Writer/Renderer/Feed/Rss.php
index 84056a92..75c502e3 100644
--- a/src/Writer/Renderer/Feed/Rss.php
+++ b/src/Writer/Renderer/Feed/Rss.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -26,7 +26,7 @@ class Rss extends Renderer\AbstractRenderer implements Renderer\RendererInterfac
      *
      * @param  Writer\Feed $container
      */
-    public function __construct (Writer\Feed $container)
+    public function __construct(Writer\Feed $container)
     {
         parent::__construct($container);
     }
diff --git a/src/Writer/Renderer/RendererInterface.php b/src/Writer/Renderer/RendererInterface.php
index b9d47c3f..b2e0e00a 100644
--- a/src/Writer/Renderer/RendererInterface.php
+++ b/src/Writer/Renderer/RendererInterface.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Source.php b/src/Writer/Source.php
index ff4534db..f0b4dcac 100644
--- a/src/Writer/Source.php
+++ b/src/Writer/Source.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Version.php b/src/Writer/Version.php
index 806d5906..8dd20df9 100644
--- a/src/Writer/Version.php
+++ b/src/Writer/Version.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/src/Writer/Writer.php b/src/Writer/Writer.php
index ccd69d4d..ae8e1536 100644
--- a/src/Writer/Writer.php
+++ b/src/Writer/Writer.php
@@ -3,7 +3,7 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
diff --git a/test/PubSubHubbub/Model/SubscriptionTest.php b/test/PubSubHubbub/Model/SubscriptionTest.php
index c4e4ecac..ee672b30 100644
--- a/test/PubSubHubbub/Model/SubscriptionTest.php
+++ b/test/PubSubHubbub/Model/SubscriptionTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub\Model;
@@ -17,9 +16,6 @@
 use Zend\Feed\PubSubHubbub\Model\Subscription;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Pubsubhubbub_Model
  */
diff --git a/test/PubSubHubbub/PubSubHubbubTest.php b/test/PubSubHubbub/PubSubHubbubTest.php
index 04c92181..0b488280 100644
--- a/test/PubSubHubbub/PubSubHubbubTest.php
+++ b/test/PubSubHubbub/PubSubHubbubTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader\Reader as FeedReader;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Subsubhubbub
  */
diff --git a/test/PubSubHubbub/PublisherTest.php b/test/PubSubHubbub/PublisherTest.php
index c1d3cae1..ee985855 100644
--- a/test/PubSubHubbub/PublisherTest.php
+++ b/test/PubSubHubbub/PublisherTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub;
@@ -16,9 +15,6 @@
 use Zend\Feed\PubSubHubbub\PubSubHubbub;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Subsubhubbub
  */
diff --git a/test/PubSubHubbub/Subscriber/CallbackTest.php b/test/PubSubHubbub/Subscriber/CallbackTest.php
index 77394180..257e530f 100644
--- a/test/PubSubHubbub/Subscriber/CallbackTest.php
+++ b/test/PubSubHubbub/Subscriber/CallbackTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub\Subscriber;
@@ -18,9 +17,6 @@
 use ArrayObject;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Subsubhubbub
  */
diff --git a/test/PubSubHubbub/SubscriberHttpTest.php b/test/PubSubHubbub/SubscriberHttpTest.php
index 92f919e7..7cab1f34 100644
--- a/test/PubSubHubbub/SubscriberHttpTest.php
+++ b/test/PubSubHubbub/SubscriberHttpTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub;
@@ -23,9 +22,6 @@
  * You can also set the proper constant in your test configuration file to
  * point to the right place.
  *
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Subsubhubbub
  */
diff --git a/test/PubSubHubbub/SubscriberTest.php b/test/PubSubHubbub/SubscriberTest.php
index f734c17c..801e7799 100644
--- a/test/PubSubHubbub/SubscriberTest.php
+++ b/test/PubSubHubbub/SubscriberTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\PubSubHubbub;
@@ -16,9 +15,6 @@
 use Zend\Http\Client as HttpClient;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Subsubhubbub
  */
diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php
index 9d1c63bc..333be6c5 100644
--- a/test/Reader/Entry/AtomStandaloneEntryTest.php
+++ b/test/Reader/Entry/AtomStandaloneEntryTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Entry;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Entry/AtomTest.php b/test/Reader/Entry/AtomTest.php
index 6e429c8b..ead2d411 100644
--- a/test/Reader/Entry/AtomTest.php
+++ b/test/Reader/Entry/AtomTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Entry;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
@@ -115,7 +111,7 @@ public function testGetsDateCreatedWithFractional()
             file_get_contents($this->feedSamplePath . '/datecreated/plain/fractional.xml')
         );
         $entry = $feed->current();
-        $edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
+        $edate = new DateTime('2009-03-07T08:03:50.80Z');
         $this->assertEquals($edate, $entry->getDateCreated());
     }
 
@@ -148,7 +144,7 @@ public function testGetsDateModifiedWithFractional()
             file_get_contents($this->feedSamplePath . '/datemodified/plain/fractional.xml')
         );
         $entry = $feed->current();
-        $edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
+        $edate = new DateTime('2009-03-07T08:03:50.80Z');
         $this->assertEquals($edate, $entry->getDateModified());
     }
 
diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
index 880be166..c7631c71 100644
--- a/test/Reader/Entry/CommonTest.php
+++ b/test/Reader/Entry/CommonTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Entry;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
@@ -76,7 +72,9 @@ public function testSaveXmlOutputsXmlStringForEntry()
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
-        $this->assertEquals($entry->saveXml(), file_get_contents($this->feedSamplePath.'/atom_rewrittenbydom.xml'));
+        $expected = file_get_contents($this->feedSamplePath.'/atom_rewrittenbydom.xml');
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $entry->saveXml());
     }
 
     public function testGetsNamedExtension()
diff --git a/test/Reader/Entry/RssTest.php b/test/Reader/Entry/RssTest.php
index 0729b230..213f6a07 100644
--- a/test/Reader/Entry/RssTest.php
+++ b/test/Reader/Entry/RssTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Entry;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
- * @category Zend
- * @package Zend_Feed
- * @subpackage UnitTests
  * @group Zend_Feed
  * @group Zend_Feed_Reader
  */
diff --git a/test/Reader/Entry/_files/Common/atom.xml b/test/Reader/Entry/_files/Common/atom.xml
index 2b9296f0..d9f854e8 100644
--- a/test/Reader/Entry/_files/Common/atom.xml
+++ b/test/Reader/Entry/_files/Common/atom.xml
@@ -427,7 +427,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Entry/_files/Common/atom_noencodingdefined.xml b/test/Reader/Entry/_files/Common/atom_noencodingdefined.xml
index 875beac0..ed47acc3 100644
--- a/test/Reader/Entry/_files/Common/atom_noencodingdefined.xml
+++ b/test/Reader/Entry/_files/Common/atom_noencodingdefined.xml
@@ -427,7 +427,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Entry/_files/Common/rss.xml b/test/Reader/Entry/_files/Common/rss.xml
index b51a4890..a4f7f405 100644
--- a/test/Reader/Entry/_files/Common/rss.xml
+++ b/test/Reader/Entry/_files/Common/rss.xml
@@ -406,7 +406,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Feed/AtomSourceTest.php b/test/Reader/Feed/AtomSourceTest.php
index 139f637b..32b775ca 100644
--- a/test/Reader/Feed/AtomSourceTest.php
+++ b/test/Reader/Feed/AtomSourceTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Feed;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Feed/AtomTest.php b/test/Reader/Feed/AtomTest.php
index c1b18c99..b2f3e161 100644
--- a/test/Reader/Feed/AtomTest.php
+++ b/test/Reader/Feed/AtomTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Feed;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
index 189d1550..647dfef8 100644
--- a/test/Reader/Feed/CommonTest.php
+++ b/test/Reader/Feed/CommonTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Feed;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Reader\Reader
 */
@@ -70,7 +66,9 @@ public function testSaveXmlOutputsXmlStringForFeed()
         $feed = Reader\Reader::importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
-        $this->assertEquals($feed->saveXml(), file_get_contents($this->feedSamplePath.'/atom_rewrittenbydom.xml'));
+        $expected = file_get_contents($this->feedSamplePath.'/atom_rewrittenbydom.xml');
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $feed->saveXml());
     }
 
     public function testGetsNamedExtension()
diff --git a/test/Reader/Feed/RssTest.php b/test/Reader/Feed/RssTest.php
index b9cbeeb6..ee54d6e8 100644
--- a/test/Reader/Feed/RssTest.php
+++ b/test/Reader/Feed/RssTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Feed;
@@ -14,9 +13,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Feed/_files/Common/atom.xml b/test/Reader/Feed/_files/Common/atom.xml
index 2b9296f0..d9f854e8 100644
--- a/test/Reader/Feed/_files/Common/atom.xml
+++ b/test/Reader/Feed/_files/Common/atom.xml
@@ -427,7 +427,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Feed/_files/Common/atom_noencodingdefined.xml b/test/Reader/Feed/_files/Common/atom_noencodingdefined.xml
index 875beac0..ed47acc3 100644
--- a/test/Reader/Feed/_files/Common/atom_noencodingdefined.xml
+++ b/test/Reader/Feed/_files/Common/atom_noencodingdefined.xml
@@ -427,7 +427,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Feed/_files/Common/atom_rewrittenbydom.xml b/test/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
index 6acfdf5f..163b40f4 100644
--- a/test/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
+++ b/test/Reader/Feed/_files/Common/atom_rewrittenbydom.xml
@@ -423,7 +423,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Feed/_files/Common/rss.xml b/test/Reader/Feed/_files/Common/rss.xml
index b51a4890..a4f7f405 100644
--- a/test/Reader/Feed/_files/Common/rss.xml
+++ b/test/Reader/Feed/_files/Common/rss.xml
@@ -406,7 +406,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Integration/H-OnlineComAtom10Test.php b/test/Reader/Integration/HOnlineComAtom10Test.php
similarity index 97%
rename from test/Reader/Integration/H-OnlineComAtom10Test.php
rename to test/Reader/Integration/HOnlineComAtom10Test.php
index 57bbfb95..5f171173 100644
--- a/test/Reader/Integration/H-OnlineComAtom10Test.php
+++ b/test/Reader/Integration/HOnlineComAtom10Test.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Integration;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Integration/LautDeRdfTest.php b/test/Reader/Integration/LautDeRdfTest.php
index 7926de7f..8b03a8ce 100644
--- a/test/Reader/Integration/LautDeRdfTest.php
+++ b/test/Reader/Integration/LautDeRdfTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Integration;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Integration/PodcastRss2Test.php b/test/Reader/Integration/PodcastRss2Test.php
index 3be62938..efaa506a 100644
--- a/test/Reader/Integration/PodcastRss2Test.php
+++ b/test/Reader/Integration/PodcastRss2Test.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Integration;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
@@ -100,10 +96,12 @@ public function testGetsDescription()
         $feed = Reader\Reader::importString(
             file_get_contents($this->feedSamplePath)
         );
-        $this->assertEquals('All About Everything is a show about everything.
+        $expected = 'All About Everything is a show about everything.
             Each week we dive into any subject known to man and talk
             about it as much as we can. Look for our Podcast in the
-            iTunes Store', $feed->getDescription());
+            iTunes Store';
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $feed->getDescription());
     }
 
     public function testGetsLanguage()
@@ -209,8 +207,10 @@ public function testGetsSubtitle()
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
-        $this->assertEquals('A short primer on table spices
-            ', $entry->getSubtitle());
+        $expected = 'A short primer on table spices
+            ';
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $entry->getSubtitle());
     }
 
     public function testGetsSummary()
@@ -219,10 +219,12 @@ public function testGetsSummary()
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
-        $this->assertEquals('This week we talk about salt and pepper
+        $expected = 'This week we talk about salt and pepper
                 shakers, comparing and contrasting pour rates,
                 construction materials, and overall aesthetics. Come and
-                join the party!', $entry->getSummary());
+                join the party!';
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $entry->getSummary());
     }
 
     public function testGetsDuration()
@@ -240,8 +242,10 @@ public function testGetsKeywords()
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
-        $this->assertEquals('salt, pepper, shaker, exciting
-            ', $entry->getKeywords());
+        $expected = 'salt, pepper, shaker, exciting
+            ';
+        $expected = str_replace("\r\n", "\n", $expected);
+        $this->assertEquals($expected, $entry->getKeywords());
     }
 
     public function testGetsEntryEncoding()
diff --git a/test/Reader/Integration/WordpressAtom10Test.php b/test/Reader/Integration/WordpressAtom10Test.php
index 60849f1a..a87337ef 100644
--- a/test/Reader/Integration/WordpressAtom10Test.php
+++ b/test/Reader/Integration/WordpressAtom10Test.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Integration;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Integration/WordpressRss2DcAtomTest.php b/test/Reader/Integration/WordpressRss2DcAtomTest.php
index 0af97032..6059d0d5 100644
--- a/test/Reader/Integration/WordpressRss2DcAtomTest.php
+++ b/test/Reader/Integration/WordpressRss2DcAtomTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader\Integration;
@@ -13,9 +12,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
diff --git a/test/Reader/Integration/_files/wordpress-atom10.xml b/test/Reader/Integration/_files/wordpress-atom10.xml
index 2b9296f0..d9f854e8 100644
--- a/test/Reader/Integration/_files/wordpress-atom10.xml
+++ b/test/Reader/Integration/_files/wordpress-atom10.xml
@@ -427,7 +427,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/Integration/_files/wordpress-rss2-dc-atom.xml b/test/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
index b51a4890..a4f7f405 100644
--- a/test/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
+++ b/test/Reader/Integration/_files/wordpress-rss2-dc-atom.xml
@@ -406,7 +406,7 @@ My programming adventure started out with Visual Basic 3 back in 1993. I was jus
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  * @package   Zend_Feed
  */
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 3ed4d473..d5ad292e 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Reader;
@@ -16,9 +15,6 @@
 use Zend\Feed\Reader;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Reader
 */
@@ -268,6 +264,11 @@ public function testRegistersUserExtension()
         $this->assertTrue(Reader\Reader::isRegistered('JungleBooks'));
     }
 
+    /**
+     * This test is failing on windows:
+     * Failed asserting that exception of type "Zend\Feed\Reader\Exception\RuntimeException" matches expected exception "Zend\Feed\Reader\Exception\InvalidArgumentException". Message was: "DOMDocument cannot parse XML: Entity 'discloseInfo' failed to parse".
+     * @todo why is the assertEquals commented out?
+     */
     public function testXxePreventionOnFeedParsing()
     {
         $this->setExpectedException('Zend\Feed\Reader\Exception\InvalidArgumentException');
@@ -301,6 +302,13 @@ public function testImportRemoteFeedMethodPerformsAsExpected()
         $this->assertEquals(Reader\Reader::TYPE_RSS_20, $type);
     }
 
+    public function testImportStringMethodThrowProperExceptionOnEmptyString()
+    {
+        $this->setExpectedException('Zend\Feed\Reader\Exception\InvalidArgumentException');
+        $string = ' ';
+        $feed = Reader\Reader::importString($string);
+    }
+
     protected function _getTempDirectory()
     {
         $tmpdir = array();
diff --git a/test/Reader/_files/My/Extension/JungleBooks/Entry.php b/test/Reader/_files/My/Extension/JungleBooks/Entry.php
index ddf1dea4..b630f1f3 100644
--- a/test/Reader/_files/My/Extension/JungleBooks/Entry.php
+++ b/test/Reader/_files/My/Extension/JungleBooks/Entry.php
@@ -3,20 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace My\Extension\JungleBooks;
 
 use Zend\Feed\Reader\Extension;
 
-/**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
- */
 class Entry extends Extension\AbstractEntry
 {
 
diff --git a/test/Reader/_files/My/Extension/JungleBooks/Feed.php b/test/Reader/_files/My/Extension/JungleBooks/Feed.php
index 0006fb0c..e0f773bd 100644
--- a/test/Reader/_files/My/Extension/JungleBooks/Feed.php
+++ b/test/Reader/_files/My/Extension/JungleBooks/Feed.php
@@ -3,20 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace My\Extension\JungleBooks;
 
 use Zend\Feed\Reader\Extension;
 
-/**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
- */
 class Feed extends Extension\AbstractFeed
 {
 
diff --git a/test/Writer/DeletedTest.php b/test/Writer/DeletedTest.php
index 2c6e6301..9e77a516 100644
--- a/test/Writer/DeletedTest.php
+++ b/test/Writer/DeletedTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer;
@@ -14,9 +13,6 @@
 use Zend\Feed\Writer;
 
 /**
-* @category Zend
-* @package Zend_Exception
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Writer
 */
@@ -43,7 +39,7 @@ public function testSetReferenceThrowsExceptionOnInvalidParameter()
     public function testGetReferenceReturnsNullIfNotSet()
     {
         $entry = new Writer\Deleted;
-        $this->assertTrue(is_null($entry->getReference()));
+        $this->assertTrue(null === $entry->getReference());
     }
 
     public function testSetWhenDefaultsToCurrentTime()
@@ -105,7 +101,7 @@ public function testSetWhenThrowsExceptionOnInvalidParameter()
     public function testGetWhenReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Deleted;
-        $this->assertTrue(is_null($entry->getWhen()));
+        $this->assertTrue(null === $entry->getWhen());
     }
 
     public function testAddsByNameFromArray()
diff --git a/test/Writer/EntryTest.php b/test/Writer/EntryTest.php
index c1a160d7..b3983414 100644
--- a/test/Writer/EntryTest.php
+++ b/test/Writer/EntryTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer;
@@ -14,9 +13,6 @@
 use Zend\Feed\Writer;
 
 /**
- * @category   Zend
- * @package    Zend_Exception
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -308,25 +304,25 @@ public function testSetDateModifiedThrowsExceptionOnInvalidParameter()
     public function testGetDateCreatedReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDateCreated()));
+        $this->assertTrue(null === $entry->getDateCreated());
     }
 
     public function testGetDateModifiedReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDateModified()));
+        $this->assertTrue(null === $entry->getDateModified());
     }
 
     public function testGetCopyrightReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCopyright()));
+        $this->assertTrue(null === $entry->getCopyright());
     }
 
     public function testGetContentReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getContent()));
+        $this->assertTrue(null === $entry->getContent());
     }
 
     public function testSetsDescription()
@@ -349,7 +345,7 @@ public function testSetDescriptionThrowsExceptionOnInvalidParameter()
     public function testGetDescriptionReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getDescription()));
+        $this->assertTrue(null === $entry->getDescription());
     }
 
     public function testSetsId()
@@ -372,7 +368,7 @@ public function testSetIdThrowsExceptionOnInvalidParameter()
     public function testGetIdReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getId()));
+        $this->assertTrue(null === $entry->getId());
     }
 
     public function testSetsLink()
@@ -405,13 +401,13 @@ public function testSetLinkThrowsExceptionOnInvalidUri()
     public function testGetLinkReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getLink()));
+        $this->assertTrue(null === $entry->getLink());
     }
 
     public function testGetLinksReturnsNullIfNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getLinks()));
+        $this->assertTrue(null === $entry->getLinks());
     }
 
     public function testSetsCommentLink()
@@ -444,7 +440,7 @@ public function testSetCommentLinkThrowsExceptionOnInvalidUri()
     public function testGetCommentLinkReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentLink()));
+        $this->assertTrue(null === $entry->getCommentLink());
     }
 
     public function testSetsCommentFeedLink()
@@ -494,7 +490,7 @@ public function testSetCommentFeedLinkThrowsExceptionOnInvalidType()
     public function testGetCommentFeedLinkReturnsNullIfNoneSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentFeedLinks()));
+        $this->assertTrue(null === $entry->getCommentFeedLinks());
     }
 
     public function testSetsTitle()
@@ -517,7 +513,7 @@ public function testSetTitleThrowsExceptionOnInvalidParameter()
     public function testGetTitleReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getTitle()));
+        $this->assertTrue(null === $entry->getTitle());
     }
 
     public function testSetsCommentCount()
@@ -602,7 +598,7 @@ public function testSetCommentCountThrowsExceptionOnInvalidNonIntegerParameter()
     public function testGetCommentCountReturnsNullIfDateNotSet()
     {
         $entry = new Writer\Entry;
-        $this->assertTrue(is_null($entry->getCommentCount()));
+        $this->assertTrue(null === $entry->getCommentCount());
     }
 
     /**
diff --git a/test/Writer/Extension/ITunes/EntryTest.php b/test/Writer/Extension/ITunes/EntryTest.php
index d6b852c0..6a69dcb8 100644
--- a/test/Writer/Extension/ITunes/EntryTest.php
+++ b/test/Writer/Extension/ITunes/EntryTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Extension\ITunes;
@@ -13,9 +12,6 @@
 use Zend\Feed\Writer;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Writer
 */
diff --git a/test/Writer/Extension/ITunes/FeedTest.php b/test/Writer/Extension/ITunes/FeedTest.php
index 09119d64..cc2b1486 100644
--- a/test/Writer/Extension/ITunes/FeedTest.php
+++ b/test/Writer/Extension/ITunes/FeedTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Extension\ITunes;
@@ -13,9 +12,6 @@
 use Zend\Feed\Writer;
 
 /**
-* @category Zend
-* @package Zend_Feed
-* @subpackage UnitTests
 * @group Zend_Feed
 * @group Zend_Feed_Writer
 */
diff --git a/test/Writer/FeedTest.php b/test/Writer/FeedTest.php
index 112dfe61..df41ee7a 100644
--- a/test/Writer/FeedTest.php
+++ b/test/Writer/FeedTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer;
@@ -16,9 +15,6 @@
 use Zend\Feed\Writer\Version;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -246,13 +242,13 @@ public function testSetDateModifiedThrowsExceptionOnInvalidParameter()
     public function testGetDateCreatedReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDateCreated()));
+        $this->assertTrue(null === $writer->getDateCreated());
     }
 
     public function testGetDateModifiedReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDateModified()));
+        $this->assertTrue(null === $writer->getDateModified());
     }
 
     public function testSetLastBuildDateDefaultsToCurrentTime()
@@ -314,13 +310,13 @@ public function testSetLastBuildDateThrowsExceptionOnInvalidParameter()
     public function testGetLastBuildDateReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLastBuildDate()));
+        $this->assertTrue(null === $writer->getLastBuildDate());
     }
 
     public function testGetCopyrightReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getCopyright()));
+        $this->assertTrue(null === $writer->getCopyright());
     }
 
     public function testSetsDescription()
@@ -343,7 +339,7 @@ public function testSetDescriptionThrowsExceptionOnInvalidParameter()
     public function testGetDescriptionReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getDescription()));
+        $this->assertTrue(null === $writer->getDescription());
     }
 
     public function testSetsId()
@@ -398,7 +394,7 @@ public function testSetIdThrowsExceptionOnInvalidUri()
     public function testGetIdReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getId()));
+        $this->assertTrue(null === $writer->getId());
     }
 
     public function testSetsLanguage()
@@ -421,7 +417,7 @@ public function testSetLanguageThrowsExceptionOnInvalidParameter()
     public function testGetLanguageReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLanguage()));
+        $this->assertTrue(null === $writer->getLanguage());
     }
 
     public function testSetsLink()
@@ -454,7 +450,7 @@ public function testSetLinkThrowsExceptionOnInvalidUri()
     public function testGetLinkReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getLink()));
+        $this->assertTrue(null === $writer->getLink());
     }
 
     public function testSetsEncoding()
@@ -500,7 +496,7 @@ public function testSetTitleThrowsExceptionOnInvalidParameter()
     public function testGetTitleReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getTitle()));
+        $this->assertTrue(null === $writer->getTitle());
     }
 
     public function testSetsGeneratorName()
@@ -636,7 +632,7 @@ public function testSetsGeneratorThrowsExceptionOnInvalidUri_Deprecated()
     public function testGetGeneratorReturnsNullIfDateNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getGenerator()));
+        $this->assertTrue(null === $writer->getGenerator());
     }
 
     public function testSetsFeedLink()
@@ -669,7 +665,7 @@ public function testSetsFeedLinkThrowsExceptionOnInvalidUri()
     public function testGetFeedLinksReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getFeedLinks()));
+        $this->assertTrue(null === $writer->getFeedLinks());
     }
 
     public function testSetsBaseUrl()
@@ -692,7 +688,7 @@ public function testSetsBaseUrlThrowsExceptionOnInvalidUri()
     public function testGetBaseUrlReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getBaseUrl()));
+        $this->assertTrue(null === $writer->getBaseUrl());
     }
 
     public function testAddsHubUrl()
@@ -722,7 +718,7 @@ public function testAddingHubUrlThrowsExceptionOnInvalidUri()
     public function testAddingHubUrlReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getHubs()));
+        $this->assertTrue(null === $writer->getHubs());
     }
 
     public function testCreatesNewEntryDataContainer()
@@ -880,7 +876,7 @@ public function testSetsImageDescription()
     public function testGetCategoriesReturnsNullIfNotSet()
     {
         $writer = new Writer\Feed;
-        $this->assertTrue(is_null($writer->getCategories()));
+        $this->assertTrue(null === $writer->getCategories());
     }
 
     public function testAddsAndOrdersEntriesByDateIfRequested()
@@ -1025,6 +1021,7 @@ public function testExportRss()
 
 EOT;
         $feed = str_replace('%version%', Version::VERSION, $feed);
+        $feed = str_replace("\r\n", "\n", $feed);
         $this->assertEquals($feed, $export);
     }
 
@@ -1046,6 +1043,7 @@ public function testExportRssIgnoreExceptions()
 
 EOT;
         $feed = str_replace('%version%', Version::VERSION, $feed);
+        $feed = str_replace("\r\n", "\n", $feed);
         $this->assertEquals($feed, $export);
     }
 
diff --git a/test/Writer/Renderer/Entry/AtomTest.php b/test/Writer/Renderer/Entry/AtomTest.php
index 2077c5d5..2a7cbc43 100644
--- a/test/Writer/Renderer/Entry/AtomTest.php
+++ b/test/Writer/Renderer/Entry/AtomTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Renderer\Entry;
@@ -15,9 +14,6 @@
 use Zend\Feed\Reader;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -291,7 +287,7 @@ public function testCategoriesCanBeSet()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$entry->getCategories());
+        $this->assertEquals($expected, (array) $entry->getCategories());
     }
 
     public function testCommentFeedLinksRendered()
diff --git a/test/Writer/Renderer/Entry/RssTest.php b/test/Writer/Renderer/Entry/RssTest.php
index f5d7fa28..c05deda7 100644
--- a/test/Writer/Renderer/Entry/RssTest.php
+++ b/test/Writer/Renderer/Entry/RssTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Renderer\Entry;
@@ -15,9 +14,6 @@
 use Zend\Feed\Reader;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -341,7 +337,7 @@ public function testCategoriesCanBeSet()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$entry->getCategories());
+        $this->assertEquals($expected, (array) $entry->getCategories());
     }
 
     /**
@@ -366,7 +362,7 @@ public function testCategoriesCharDataEncoding()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$entry->getCategories());
+        $this->assertEquals($expected, (array) $entry->getCategories());
     }
 
 }
diff --git a/test/Writer/Renderer/Feed/AtomTest.php b/test/Writer/Renderer/Feed/AtomTest.php
index 823d5b91..2552c7fe 100644
--- a/test/Writer/Renderer/Feed/AtomTest.php
+++ b/test/Writer/Renderer/Feed/AtomTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Renderer\Feed;
@@ -15,9 +14,6 @@
 use Zend\Feed\Reader;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -360,7 +356,7 @@ public function testCategoriesCanBeSet()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$feed->getCategories());
+        $this->assertEquals($expected, (array) $feed->getCategories());
     }
 
     public function testCategoriesCharDataEncoding()
@@ -382,7 +378,7 @@ public function testCategoriesCharDataEncoding()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$feed->getCategories());
+        $this->assertEquals($expected, (array) $feed->getCategories());
     }
 
     public function testHubsCanBeSet()
@@ -396,7 +392,7 @@ public function testHubsCanBeSet()
         $expected = array(
             'http://www.example.com/hub', 'http://www.example.com/hub2'
         );
-        $this->assertEquals($expected, (array)$feed->getHubs());
+        $this->assertEquals($expected, (array) $feed->getHubs());
     }
 
     public function testImageCanBeSet()
diff --git a/test/Writer/Renderer/Feed/RssTest.php b/test/Writer/Renderer/Feed/RssTest.php
index 07736219..f04a4c92 100644
--- a/test/Writer/Renderer/Feed/RssTest.php
+++ b/test/Writer/Renderer/Feed/RssTest.php
@@ -3,9 +3,8 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Feed
  */
 
 namespace ZendTest\Feed\Writer\Renderer\Feed;
@@ -17,9 +16,6 @@
 use Zend\Feed\Reader;
 
 /**
- * @category   Zend
- * @package    Zend_Feed
- * @subpackage UnitTests
  * @group      Zend_Feed
  * @group      Zend_Feed_Writer
  */
@@ -335,7 +331,7 @@ public function testCategoriesCanBeSet()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$feed->getCategories());
+        $this->assertEquals($expected, (array) $feed->getCategories());
     }
 
     /**
@@ -360,7 +356,7 @@ public function testCategoriesCharDataEncoding()
                   'label'  => 'cat_dog2',
                   'scheme' => null)
         );
-        $this->assertEquals($expected, (array)$feed->getCategories());
+        $this->assertEquals($expected, (array) $feed->getCategories());
     }
 
     public function testHubsCanBeSet()
@@ -374,7 +370,7 @@ public function testHubsCanBeSet()
         $expected = array(
             'http://www.example.com/hub', 'http://www.example.com/hub2'
         );
-        $this->assertEquals($expected, (array)$feed->getHubs());
+        $this->assertEquals($expected, (array) $feed->getHubs());
     }
 
     public function testImageCanBeSet()