From fc168dac22cd0258272485344db664fd45356da8 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Fri, 19 Feb 2016 21:17:16 +0200
Subject: [PATCH 01/15] replaced static to dynamic methods

---
 src/Reader/Feed/AbstractFeed.php              |   4 +-
 src/Reader/Feed/Rss.php                       |   2 +-
 src/Reader/Reader.php                         | 152 ++++++++----------
 src/Reader/ReaderImportInterface.php          |   8 +-
 test/Reader/Entry/AtomStandaloneEntryTest.php |   1 -
 test/Reader/Entry/AtomTest.php                |   1 -
 test/Reader/Entry/CommonTest.php              |   1 -
 test/Reader/Entry/RssTest.php                 |   1 -
 test/Reader/Feed/AtomSourceTest.php           |   1 -
 test/Reader/Feed/AtomTest.php                 |   1 -
 test/Reader/Feed/CommonTest.php               |   1 -
 test/Reader/Feed/RssTest.php                  |   1 -
 .../Integration/HOnlineComAtom10Test.php      |   1 -
 test/Reader/Integration/LautDeRdfTest.php     |   1 -
 test/Reader/Integration/PodcastRss2Test.php   |   1 -
 .../Integration/WordpressAtom10Test.php       |   1 -
 .../Integration/WordpressRss2DcAtomTest.php   |   1 -
 test/Reader/ReaderTest.php                    |   7 +-
 18 files changed, 76 insertions(+), 110 deletions(-)

diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 78b671dd..86ad207b 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -275,8 +275,8 @@ public function getExtension($name)
 
     protected function loadExtensions()
     {
-        $all     = Reader\Reader::getExtensions();
-        $manager = Reader\Reader::getExtensionManager();
+        $all     = (new Reader\Reader())->getExtensions();
+        $manager = (new Reader\Reader())->getExtensionManager();
         $feed    = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 1a148b21..6f17ae4d 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -29,7 +29,7 @@ public function __construct(DOMDocument $dom, $type = null)
     {
         parent::__construct($dom, $type);
 
-        $manager = Reader\Reader::getExtensionManager();
+        $manager = (new Reader\Reader())->getExtensionManager();
 
         $feed = $manager->get('DublinCore\Feed');
         $feed->setDomDocument($dom);
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 693a3e2e..27a9894b 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -53,27 +53,27 @@ class Reader implements ReaderImportInterface
      *
      * @var CacheStorage
      */
-    protected static $cache = null;
+    protected $cache = null;
 
     /**
      * HTTP client object to use for retrieving feeds
      *
      * @var Http\ClientInterface
      */
-    protected static $httpClient = null;
+    protected $httpClient = null;
 
     /**
      * Override HTTP PUT and DELETE request methods?
      *
      * @var bool
      */
-    protected static $httpMethodOverride = false;
+    protected $httpMethodOverride = false;
 
-    protected static $httpConditionalGet = false;
+    protected $httpConditionalGet = false;
 
-    protected static $extensionManager = null;
+    protected $extensionManager = null;
 
-    protected static $extensions = [
+    protected $extensions = [
         'feed' => [
             'DublinCore\Feed',
             'Atom\Feed'
@@ -92,14 +92,34 @@ class Reader implements ReaderImportInterface
         ]
     ];
 
+
+    /**
+     * Construct a new reader object
+     *
+     * @param  Http\ClientInterface $httpClient
+     * @param  CacheStorage $cache
+     * @return Zend\Feed\Reader\Reader
+     */
+    public function __construct(Http\ClientInterface $httpClient = null, CacheStorage $cache = null)
+    {
+        if (is_null($httpClient)) {
+            $this->setHttpClient(new Http\ZendHttpClientDecorator(new ZendHttp\Client()));
+        } else {
+            $this->setHttpClient($httpClient);
+        }
+        if (!is_null($cache)) {
+            $this->setCache($cache);
+        }
+    }
+
     /**
      * Get the Feed cache
      *
      * @return CacheStorage
      */
-    public static function getCache()
+    public function getCache()
     {
-        return static::$cache;
+        return $this->cache;
     }
 
     /**
@@ -108,9 +128,9 @@ public static function getCache()
      * @param  CacheStorage $cache
      * @return void
      */
-    public static function setCache(CacheStorage $cache)
+    public function setCache(CacheStorage $cache)
     {
-        static::$cache = $cache;
+        $this->cache = $cache;
     }
 
     /**
@@ -121,7 +141,7 @@ public static function setCache(CacheStorage $cache)
      * @param  ZendHttp\Client | Http\ClientInterface $httpClient
      * @return void
      */
-    public static function setHttpClient($httpClient)
+    public function setHttpClient($httpClient)
     {
         if ($httpClient instanceof ZendHttp\Client) {
             $httpClient = new Http\ZendHttpClientDecorator($httpClient);
@@ -130,7 +150,7 @@ public static function setHttpClient($httpClient)
         if (! $httpClient instanceof Http\ClientInterface) {
             throw new InvalidHttpClientException();
         }
-        static::$httpClient = $httpClient;
+        $this->httpClient = $httpClient;
     }
 
     /**
@@ -138,13 +158,9 @@ public static function setHttpClient($httpClient)
      *
      * @return Http\ClientInterface
      */
-    public static function getHttpClient()
+    public function getHttpClient()
     {
-        if (! static::$httpClient) {
-            static::$httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client());
-        }
-
-        return static::$httpClient;
+        return $this->httpClient;
     }
 
     /**
@@ -160,7 +176,7 @@ public static function getHttpClient()
      * @param  bool $override Whether to override PUT and DELETE.
      * @return void
      */
-    public static function setHttpMethodOverride($override = true)
+    public function setHttpMethodOverride($override = true)
     {
         static::$httpMethodOverride = $override;
     }
@@ -170,7 +186,7 @@ public static function setHttpMethodOverride($override = true)
      *
      * @return bool
      */
-    public static function getHttpMethodOverride()
+    public function getHttpMethodOverride()
     {
         return static::$httpMethodOverride;
     }
@@ -181,7 +197,7 @@ public static function getHttpMethodOverride()
      * @param  bool $bool
      * @return void
      */
-    public static function useHttpConditionalGet($bool = true)
+    public function useHttpConditionalGet($bool = true)
     {
         static::$httpConditionalGet = $bool;
     }
@@ -195,10 +211,10 @@ public static function useHttpConditionalGet($bool = true)
      * @return Feed\FeedInterface
      * @throws Exception\RuntimeException
      */
-    public static function import($uri, $etag = null, $lastModified = null)
+    public function import($uri, $etag = null, $lastModified = null)
     {
-        $cache   = self::getCache();
-        $client  = self::getHttpClient();
+        $cache   = $this->getCache();
+        $client  = $this->getHttpClient();
         $cacheId = 'Zend_Feed_Reader_' . md5($uri);
 
         if (static::$httpConditionalGet && $cache) {
@@ -277,7 +293,7 @@ public static function import($uri, $etag = null, $lastModified = null)
      * @return self
      * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
      */
-    public static function importRemoteFeed($uri, Http\ClientInterface $client)
+    public function importRemoteFeed($uri, Http\ClientInterface $client)
     {
         $response = $client->get($uri);
         if (! $response instanceof Http\ResponseInterface) {
@@ -304,7 +320,7 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client)
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException
      */
-    public static function importString($string)
+    public function importString($string)
     {
         $trimmed = trim($string);
         if (!is_string($string) || empty($trimmed)) {
@@ -361,7 +377,7 @@ public static function importString($string)
      * @throws Exception\RuntimeException
      * @return Feed\FeedInterface
      */
-    public static function importFile($filename)
+    public function importFile($filename)
     {
         ErrorHandler::start();
         $feed = file_get_contents($filename);
@@ -379,7 +395,7 @@ public static function importFile($filename)
      * @return FeedSet
      * @throws Exception\RuntimeException
      */
-    public static function findFeedLinks($uri)
+    public function findFeedLinks($uri)
     {
         $client   = static::getHttpClient();
         $response = $client->get($uri);
@@ -419,7 +435,7 @@ public static function findFeedLinks($uri)
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException
      */
-    public static function detectType($feed, $specOnly = false)
+    public function detectType($feed, $specOnly = false)
     {
         if ($feed instanceof Feed\AbstractFeed) {
             $dom = $feed->getDomDocument();
@@ -540,9 +556,9 @@ public static function detectType($feed, $specOnly = false)
      *
      * @param ExtensionManagerInterface $extensionManager
      */
-    public static function setExtensionManager(ExtensionManagerInterface $extensionManager)
+    public function setExtensionManager(ExtensionManagerInterface $extensionManager)
     {
-        static::$extensionManager = $extensionManager;
+        $this->extensionManager = $extensionManager;
     }
 
     /**
@@ -550,12 +566,12 @@ public static function setExtensionManager(ExtensionManagerInterface $extensionM
      *
      * @return ExtensionManagerInterface
      */
-    public static function getExtensionManager()
+    public function getExtensionManager()
     {
-        if (!isset(static::$extensionManager)) {
-            static::setExtensionManager(new StandaloneExtensionManager());
+        if (!isset($this->extensionManager)) {
+            $this->setExtensionManager(new StandaloneExtensionManager());
         }
-        return static::$extensionManager;
+        return $this->extensionManager;
     }
 
     /**
@@ -565,7 +581,7 @@ public static function getExtensionManager()
      * @return void
      * @throws Exception\RuntimeException if unable to resolve Extension class
      */
-    public static function registerExtension($name)
+    public function registerExtension($name)
     {
         $feedName  = $name . '\Feed';
         $entryName = $name . '\Entry';
@@ -581,10 +597,10 @@ public static function registerExtension($name)
                 . ' using Plugin Loader. Check prefix paths are configured and extension exists.');
         }
         if ($manager->has($feedName)) {
-            static::$extensions['feed'][] = $feedName;
+            $this->extensions['feed'][] = $feedName;
         }
         if ($manager->has($entryName)) {
-            static::$extensions['entry'][] = $entryName;
+            $this->extensions['entry'][] = $entryName;
         }
     }
 
@@ -594,12 +610,12 @@ public static function registerExtension($name)
      * @param  string $extensionName
      * @return bool
      */
-    public static function isRegistered($extensionName)
+    public function isRegistered($extensionName)
     {
         $feedName  = $extensionName . '\Feed';
         $entryName = $extensionName . '\Entry';
-        if (in_array($feedName, static::$extensions['feed'])
-            || in_array($entryName, static::$extensions['entry'])
+        if (in_array($feedName, $this->extensions['feed'])
+            || in_array($entryName, $this->extensions['entry'])
         ) {
             return true;
         }
@@ -611,41 +627,9 @@ public static function isRegistered($extensionName)
      *
      * @return array
      */
-    public static function getExtensions()
-    {
-        return static::$extensions;
-    }
-
-    /**
-     * Reset class state to defaults
-     *
-     * @return void
-     */
-    public static function reset()
+    public function getExtensions()
     {
-        static::$cache              = null;
-        static::$httpClient         = null;
-        static::$httpMethodOverride = false;
-        static::$httpConditionalGet = false;
-        static::$extensionManager   = null;
-        static::$extensions         = [
-            'feed' => [
-                'DublinCore\Feed',
-                'Atom\Feed'
-            ],
-            'entry' => [
-                'Content\Entry',
-                'DublinCore\Entry',
-                'Atom\Entry'
-            ],
-            'core' => [
-                'DublinCore\Feed',
-                'Atom\Feed',
-                'Content\Entry',
-                'DublinCore\Entry',
-                'Atom\Entry'
-            ]
-        ];
+        return $this->extensions;
     }
 
     /**
@@ -653,15 +637,15 @@ public static function reset()
      *
      * @return void
      */
-    protected static function registerCoreExtensions()
+    protected function registerCoreExtensions()
     {
-        static::registerExtension('DublinCore');
-        static::registerExtension('Content');
-        static::registerExtension('Atom');
-        static::registerExtension('Slash');
-        static::registerExtension('WellFormedWeb');
-        static::registerExtension('Thread');
-        static::registerExtension('Podcast');
+        $this->registerExtension('DublinCore');
+        $this->registerExtension('Content');
+        $this->registerExtension('Atom');
+        $this->registerExtension('Slash');
+        $this->registerExtension('WellFormedWeb');
+        $this->registerExtension('Thread');
+        $this->registerExtension('Podcast');
     }
 
     /**
@@ -671,7 +655,7 @@ protected static function registerCoreExtensions()
      * @param array
      * @return array
      */
-    public static function arrayUnique(array $array)
+    public function arrayUnique(array $array)
     {
         foreach ($array as &$value) {
             $value = serialize($value);
diff --git a/src/Reader/ReaderImportInterface.php b/src/Reader/ReaderImportInterface.php
index 0a2edd14..27bd45e0 100644
--- a/src/Reader/ReaderImportInterface.php
+++ b/src/Reader/ReaderImportInterface.php
@@ -21,7 +21,7 @@ interface ReaderImportInterface
      * @return Feed\FeedInterface
      * @throws Exception\RuntimeException
      */
-    public static function import($uri, $etag = null, $lastModified = null);
+    public function import($uri, $etag = null, $lastModified = null);
 
     /**
      * Import a feed from a remote URI
@@ -37,7 +37,7 @@ public static function import($uri, $etag = null, $lastModified = null);
      * @return self
      * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
      */
-    public static function importRemoteFeed($uri, Http\ClientInterface $client);
+    public function importRemoteFeed($uri, Http\ClientInterface $client);
 
 
     /**
@@ -48,7 +48,7 @@ public static function importRemoteFeed($uri, Http\ClientInterface $client);
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException
      */
-    public static function importString($string);
+    public function importString($string);
 
 
     /**
@@ -58,5 +58,5 @@ public static function importString($string);
      * @throws Exception\RuntimeException
      * @return Feed\FeedInterface
      */
-    public static function importFile($filename);
+    public function importFile($filename);
 }
diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php
index cef848c0..59ad066b 100644
--- a/test/Reader/Entry/AtomStandaloneEntryTest.php
+++ b/test/Reader/Entry/AtomStandaloneEntryTest.php
@@ -26,7 +26,6 @@ class AtomStandaloneEntryTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/AtomStandaloneEntry';
 
         $this->expectedCats = [
diff --git a/test/Reader/Entry/AtomTest.php b/test/Reader/Entry/AtomTest.php
index 00a20a4f..399edcd2 100644
--- a/test/Reader/Entry/AtomTest.php
+++ b/test/Reader/Entry/AtomTest.php
@@ -26,7 +26,6 @@ class AtomTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Atom';
         $this->expectedCats = [
             [
diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
index 783dfc2d..2d2b72a4 100644
--- a/test/Reader/Entry/CommonTest.php
+++ b/test/Reader/Entry/CommonTest.php
@@ -21,7 +21,6 @@ class CommonTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Common';
     }
 
diff --git a/test/Reader/Entry/RssTest.php b/test/Reader/Entry/RssTest.php
index 0015abed..86bbacb3 100644
--- a/test/Reader/Entry/RssTest.php
+++ b/test/Reader/Entry/RssTest.php
@@ -28,7 +28,6 @@ class RssTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Rss';
 
         $this->expectedCats = [
diff --git a/test/Reader/Feed/AtomSourceTest.php b/test/Reader/Feed/AtomSourceTest.php
index fe1f9244..d8820e4a 100644
--- a/test/Reader/Feed/AtomSourceTest.php
+++ b/test/Reader/Feed/AtomSourceTest.php
@@ -28,7 +28,6 @@ class AtomSourceTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/AtomSource';
         $this->expectedCats = [
             [
diff --git a/test/Reader/Feed/AtomTest.php b/test/Reader/Feed/AtomTest.php
index b96e6d9a..80e7a80e 100644
--- a/test/Reader/Feed/AtomTest.php
+++ b/test/Reader/Feed/AtomTest.php
@@ -28,7 +28,6 @@ class AtomTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Atom';
 
         $this->expectedCats = [
diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
index bb4f8101..11c4d850 100644
--- a/test/Reader/Feed/CommonTest.php
+++ b/test/Reader/Feed/CommonTest.php
@@ -21,7 +21,6 @@ class CommonTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Common';
     }
 
diff --git a/test/Reader/Feed/RssTest.php b/test/Reader/Feed/RssTest.php
index 24c0f8c2..51c2543e 100644
--- a/test/Reader/Feed/RssTest.php
+++ b/test/Reader/Feed/RssTest.php
@@ -28,7 +28,6 @@ class RssTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/Rss';
 
         $this->expectedCats = [
diff --git a/test/Reader/Integration/HOnlineComAtom10Test.php b/test/Reader/Integration/HOnlineComAtom10Test.php
index 0f3fa3fc..2f7b3e3f 100644
--- a/test/Reader/Integration/HOnlineComAtom10Test.php
+++ b/test/Reader/Integration/HOnlineComAtom10Test.php
@@ -21,7 +21,6 @@ class HOnlineComAtom10Test extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/h-online.com-atom10.xml';
     }
 
diff --git a/test/Reader/Integration/LautDeRdfTest.php b/test/Reader/Integration/LautDeRdfTest.php
index d8406865..482081ee 100644
--- a/test/Reader/Integration/LautDeRdfTest.php
+++ b/test/Reader/Integration/LautDeRdfTest.php
@@ -21,7 +21,6 @@ class LautDeRdfTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/laut.de-rdf.xml';
     }
 
diff --git a/test/Reader/Integration/PodcastRss2Test.php b/test/Reader/Integration/PodcastRss2Test.php
index 24caeec2..481d2d8a 100644
--- a/test/Reader/Integration/PodcastRss2Test.php
+++ b/test/Reader/Integration/PodcastRss2Test.php
@@ -21,7 +21,6 @@ class PodcastRss2Test extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/podcast.xml';
     }
 
diff --git a/test/Reader/Integration/WordpressAtom10Test.php b/test/Reader/Integration/WordpressAtom10Test.php
index 3ff68bc9..3b0f6818 100644
--- a/test/Reader/Integration/WordpressAtom10Test.php
+++ b/test/Reader/Integration/WordpressAtom10Test.php
@@ -21,7 +21,6 @@ class WordpressAtom10Test extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/wordpress-atom10.xml';
     }
 
diff --git a/test/Reader/Integration/WordpressRss2DcAtomTest.php b/test/Reader/Integration/WordpressRss2DcAtomTest.php
index 6d3cd0ed..dbe79562 100644
--- a/test/Reader/Integration/WordpressRss2DcAtomTest.php
+++ b/test/Reader/Integration/WordpressRss2DcAtomTest.php
@@ -21,7 +21,6 @@ class WordpressRss2DcAtomTest extends \PHPUnit_Framework_TestCase
 
     public function setup()
     {
-        Reader\Reader::reset();
         $this->feedSamplePath = dirname(__FILE__) . '/_files/wordpress-rss2-dc-atom.xml';
     }
 
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 3d06a68a..7d807416 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -29,14 +29,9 @@ public function setup()
         $this->feedSamplePath = dirname(__FILE__) . '/_files';
     }
 
-    public function tearDown()
-    {
-        Reader\Reader::reset();
-    }
-
     public function testStringImportTrimsContentToAllowSlightlyInvalidXml()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             '   ' . file_get_contents($this->feedSamplePath.'/Reader/rss20.xml')
         );
     }

From 34d36b61d3ad792a8d8a504245c88b1fcc0bbc97 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Fri, 19 Feb 2016 21:29:18 +0200
Subject: [PATCH 02/15] extensions replaced

---
 src/Reader/AbstractEntry.php       |  2 +-
 src/Reader/AbstractFeed.php        |  4 +-
 src/Reader/Entry/AbstractEntry.php |  4 +-
 src/Reader/Entry/Atom.php          |  2 +-
 src/Reader/Entry/Rss.php           |  2 +-
 src/Reader/Feed/Atom.php           |  2 +-
 src/Reader/Feed/Atom/Source.php    |  2 +-
 src/Reader/Reader.php              |  2 +-
 test/Reader/ReaderTest.php         | 90 +++++++++++++++---------------
 9 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index a706ff82..78f8f60f 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -209,7 +209,7 @@ public function __call($method, $args)
      */
     protected function _loadExtensions()
     {
-        $all = Reader::getExtensions();
+        $all = (new Reader())->getExtensions();
         $feed = $all['entry'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index 8cc23471..fbc2bfa7 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -271,8 +271,8 @@ public function getExtension($name)
 
     protected function loadExtensions()
     {
-        $all     = Reader::getExtensions();
-        $manager = Reader::getExtensionManager();
+        $all     = (new Reader())->getExtensions();
+        $manager = (new Reader())->getExtensionManager();
         $feed    = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index 1342431a..5333d5bc 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -216,8 +216,8 @@ public function __call($method, $args)
      */
     protected function loadExtensions()
     {
-        $all     = Reader\Reader::getExtensions();
-        $manager = Reader\Reader::getExtensionManager();
+        $all     = (new Reader\Reader())->getExtensions();
+        $manager = (new Reader\Reader())->getExtensionManager();
         $feed    = $all['entry'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index 84efaadd..8a194534 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -36,7 +36,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         // Everyone by now should know XPath indices start from 1 not 0
         $this->xpathQuery = '//atom:entry[' . ($this->entryKey + 1) . ']';
 
-        $manager    = Reader\Reader::getExtensionManager();
+        $manager    = (new Reader\Reader())->getExtensionManager();
         $extensions = ['Atom\Entry', 'Thread\Entry', 'DublinCore\Entry'];
 
         foreach ($extensions as $name) {
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index 0832ba36..4333e098 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -44,7 +44,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         $this->xpathQueryRss = '//item[' . ($this->entryKey+1) . ']';
         $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
 
-        $manager    = Reader\Reader::getExtensionManager();
+        $manager    = (new Reader\Reader())->getExtensionManager();
         $extensions = [
             'DublinCore\Entry',
             'Content\Entry',
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index 37064701..e0d187c0 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -25,7 +25,7 @@ class Atom extends AbstractFeed
     public function __construct(DOMDocument $dom, $type = null)
     {
         parent::__construct($dom, $type);
-        $manager = Reader\Reader::getExtensionManager();
+        $manager = (new Reader\Reader())->getExtensionManager();
 
         $atomFeed = $manager->get('Atom\Feed');
         $atomFeed->setDomDocument($dom);
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index 4f15b55c..26f7f4c5 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -35,7 +35,7 @@ public function __construct(DOMElement $source, $xpathPrefix, $type = Reader\Rea
         $this->registerNamespaces();
         $this->loadExtensions();
 
-        $manager = Reader\Reader::getExtensionManager();
+        $manager = (new Reader\Reader())->getExtensionManager();
         $extensions = ['Atom\Feed', 'DublinCore\Feed'];
 
         foreach ($extensions as $name) {
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 27a9894b..6799e403 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -585,7 +585,7 @@ public function registerExtension($name)
     {
         $feedName  = $name . '\Feed';
         $entryName = $name . '\Entry';
-        $manager   = static::getExtensionManager();
+        $manager   = $this->getExtensionManager();
         if (static::isRegistered($name)) {
             if ($manager->has($feedName) || $manager->has($entryName)) {
                 return;
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 7d807416..947fc5d1 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -38,82 +38,82 @@ public function testStringImportTrimsContentToAllowSlightlyInvalidXml()
 
     public function testDetectsFeedIsRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss20.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_20, $type);
     }
 
     public function testDetectsFeedIsRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss094.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_094, $type);
     }
 
     public function testDetectsFeedIsRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss093.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_093, $type);
     }
 
     public function testDetectsFeedIsRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss092.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_092, $type);
     }
 
     public function testDetectsFeedIsRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss091.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_091, $type);
     }
 
     public function testDetectsFeedIsRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss10.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_10, $type);
     }
 
     public function testDetectsFeedIsRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/rss090.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_090, $type);
     }
 
     public function testDetectsFeedIsAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/atom10.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_ATOM_10, $type);
     }
 
     public function testDetectsFeedIsAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/Reader/atom03.xml')
         );
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_ATOM_03, $type);
     }
 
@@ -123,13 +123,13 @@ public function testDetectsFeedIsAtom03()
     public function testDetectsTypeFromStringOrToRemindPaddyAboutForgettingATestWhichLetsAStupidTypoSurviveUnnoticedForMonths()
     {
         $feed = '<?xml version="1.0" encoding="utf-8" ?><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"><channel></channel></rdf:RDF>';
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_10, $type);
     }
 
     public function testGetEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents(dirname(__FILE__) . '/Entry/_files/Atom/title/plain/atom10.xml')
         );
 
@@ -139,7 +139,7 @@ public function testGetEncoding()
 
     public function testImportsFile()
     {
-        $feed = Reader\Reader::importFile(
+        $feed = (new Reader\Reader())->importFile(
             dirname(__FILE__) . '/Entry/_files/Atom/title/plain/atom10.xml'
         );
         $this->assertInstanceOf('Zend\Feed\Reader\Feed\FeedInterface', $feed);
@@ -151,7 +151,7 @@ public function testImportsUri()
             $this->markTestSkipped('testImportsUri() requires a network connection');
         }
 
-        Reader\Reader::import('http://www.planet-php.net/rdf/');
+        (new Reader\Reader())->import('http://www.planet-php.net/rdf/');
     }
 
     /**
@@ -164,7 +164,7 @@ public function testImportsUriAndThrowsExceptionIfNotAFeed()
             $this->markTestSkipped('testImportsUri() requires a network connection');
         }
 
-        Reader\Reader::import('http://example.com');
+        (new Reader\Reader())->import('http://example.com');
     }
 
     public function testGetsFeedLinksAsValueObject()
@@ -173,7 +173,7 @@ public function testGetsFeedLinksAsValueObject()
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
 
-        $links = Reader\Reader::findFeedLinks('http://www.planet-php.net');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.planet-php.net');
 
         $this->assertEquals('http://www.planet-php.org/rss/', $links->rss);
     }
@@ -183,7 +183,7 @@ public function testCompilesLinksAsArrayObject()
         if (!getenv('TESTS_ZEND_FEED_READER_ONLINE_ENABLED')) {
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
-        $links = Reader\Reader::findFeedLinks('http://www.planet-php.net');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.planet-php.net');
         $this->assertInstanceOf('Zend\Feed\Reader\FeedSet', $links);
         $this->assertEquals([
             'rel' => 'alternate', 'type' => 'application/rss+xml', 'href' => 'http://www.planet-php.org/rss/'
@@ -195,7 +195,7 @@ public function testFeedSetLoadsFeedObjectWhenFeedArrayKeyAccessed()
         if (!getenv('TESTS_ZEND_FEED_READER_ONLINE_ENABLED')) {
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
-        $links = Reader\Reader::findFeedLinks('http://www.planet-php.net');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.planet-php.net');
         $link = $links->getIterator()->current();
         $this->assertInstanceOf('Zend\Feed\Reader\Feed\Rss', $link['feed']);
     }
@@ -205,7 +205,7 @@ public function testZeroCountFeedSetReturnedFromEmptyList()
         if (!getenv('TESTS_ZEND_FEED_READER_ONLINE_ENABLED')) {
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
-        $links = Reader\Reader::findFeedLinks('http://www.example.com');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.example.com');
         $this->assertEquals(0, count($links));
     }
 
@@ -218,7 +218,7 @@ public function testGetsFeedLinksAndTrimsNewlines()
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
 
-        $links = Reader\Reader::findFeedLinks('http://www.infopod.com.br');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.infopod.com.br');
         $this->assertEquals('http://www.infopod.com.br/feed/', $links->rss);
     }
 
@@ -231,7 +231,7 @@ public function testGetsFeedLinksAndNormalisesRelativeUrls()
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
 
-        $links = Reader\Reader::findFeedLinks('http://meiobit.com');
+        $links = (new Reader\Reader())->findFeedLinks('http://meiobit.com');
         $this->assertEquals('http://meiobit.com/feed/', $links->rss);
     }
 
@@ -240,18 +240,18 @@ public function testGetsFeedLinksAndNormalisesRelativeUrls()
      */
     public function testGetsFeedLinksAndNormalisesRelativeUrlsOnUriWithPath()
     {
-        $currClient = Reader\Reader::getHttpClient();
+        $currClient = (new Reader\Reader())->getHttpClient();
 
         $testAdapter = new TestAdapter();
         $response = new HttpResponse();
         $response->setStatusCode(200);
         $response->setContent('<!DOCTYPE html><html><head><link rel="alternate" type="application/rss+xml" href="../test.rss"><link rel="alternate" type="application/atom+xml" href="/test.atom"></head><body></body></html>');
         $testAdapter->setResponse($response);
-        Reader\Reader::setHttpClient(new HttpClient(null, ['adapter' => $testAdapter]));
+        (new Reader\Reader())->setHttpClient(new HttpClient(null, ['adapter' => $testAdapter]));
 
-        $links = Reader\Reader::findFeedLinks('http://foo/bar');
+        $links = (new Reader\Reader())->findFeedLinks('http://foo/bar');
 
-        Reader\Reader::setHttpClient($currClient);
+        (new Reader\Reader())->setHttpClient($currClient);
 
         $this->assertEquals('http://foo/test.rss', $links->rss);
         $this->assertEquals('http://foo/test.atom', $links->atom);
@@ -266,10 +266,10 @@ public function testRegistersUserExtension()
         ));
         $manager->setInvokableClass('JungleBooks\Entry', 'My\Extension\JungleBooks\Entry');
         $manager->setInvokableClass('JungleBooks\Feed', 'My\Extension\JungleBooks\Feed');
-        Reader\Reader::setExtensionManager($manager);
-        Reader\Reader::registerExtension('JungleBooks');
+        (new Reader\Reader())->setExtensionManager($manager);
+        (new Reader\Reader())->registerExtension('JungleBooks');
 
-        $this->assertTrue(Reader\Reader::isRegistered('JungleBooks'));
+        $this->assertTrue((new Reader\Reader())->isRegistered('JungleBooks'));
     }
 
     /**
@@ -282,7 +282,7 @@ public function testXxePreventionOnFeedParsing()
         $this->setExpectedException('Zend\Feed\Reader\Exception\InvalidArgumentException');
         $string = file_get_contents($this->feedSamplePath.'/Reader/xxe-atom10.xml');
         $string = str_replace('XXE_URI', $this->feedSamplePath.'/Reader/xxe-info.txt', $string);
-        $feed = Reader\Reader::importString($string);
+        $feed = (new Reader\Reader())->importString($string);
         //$this->assertEquals('info:', $feed->getTitle());
     }
 
@@ -304,9 +304,9 @@ public function testImportRemoteFeedMethodPerformsAsExpected()
             ->with($this->equalTo($uri))
             ->will($this->returnValue($response));
 
-        $feed = Reader\Reader::importRemoteFeed($uri, $client);
+        $feed = (new Reader\Reader())->importRemoteFeed($uri, $client);
         $this->assertInstanceOf('Zend\Feed\Reader\Feed\FeedInterface', $feed);
-        $type = Reader\Reader::detectType($feed);
+        $type = (new Reader\Reader())->detectType($feed);
         $this->assertEquals(Reader\Reader::TYPE_RSS_20, $type);
     }
 
@@ -314,21 +314,21 @@ public function testImportStringMethodThrowProperExceptionOnEmptyString()
     {
         $this->setExpectedException('Zend\Feed\Reader\Exception\InvalidArgumentException');
         $string = ' ';
-        $feed = Reader\Reader::importString($string);
+        $feed = (new Reader\Reader())->importString($string);
     }
 
     public function testSetHttpFeedClient()
     {
         $client = $this->getMock('Zend\Feed\Reader\Http\ClientInterface');
-        Reader\Reader::setHttpClient($client);
-        $this->assertEquals($client, Reader\Reader::getHttpClient());
+        (new Reader\Reader())->setHttpClient($client);
+        $this->assertEquals($client, (new Reader\Reader())->getHttpClient());
     }
 
     public function testSetHttpClientWillDecorateAZendHttpClientInstance()
     {
         $client = new HttpClient();
-        Reader\Reader::setHttpClient($client);
-        $cached = Reader\Reader::getHttpClient();
+        (new Reader\Reader())->setHttpClient($client);
+        $cached = (new Reader\Reader())->getHttpClient();
         $this->assertInstanceOf(ClientInterface::class, $cached);
         $this->assertAttributeSame($client, 'client', $cached);
     }
@@ -336,7 +336,7 @@ public function testSetHttpClientWillDecorateAZendHttpClientInstance()
     public function testSetHttpClientThrowsException()
     {
         $this->setExpectedException(Reader\Exception\InvalidHttpClientException::class);
-        Reader\Reader::setHttpClient(new stdClass);
+        (new Reader\Reader())->setHttpClient(new stdClass);
     }
 
     protected function _getTempDirectory()

From c0f2290d87b21ff171e1e068eeaa288ab9be4bab Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 07:44:26 +0200
Subject: [PATCH 03/15] tests passed

---
 src/Reader/Reader.php      | 15 ++++++++-------
 test/Reader/ReaderTest.php | 29 +++++++++++++++--------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 6799e403..a3900e10 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -102,9 +102,7 @@ class Reader implements ReaderImportInterface
      */
     public function __construct(Http\ClientInterface $httpClient = null, CacheStorage $cache = null)
     {
-        if (is_null($httpClient)) {
-            $this->setHttpClient(new Http\ZendHttpClientDecorator(new ZendHttp\Client()));
-        } else {
+        if (!is_null($httpClient)) {
             $this->setHttpClient($httpClient);
         }
         if (!is_null($cache)) {
@@ -160,6 +158,9 @@ public function setHttpClient($httpClient)
      */
     public function getHttpClient()
     {
+        if (is_null($this->httpClient)) {
+            return $this->httpClient = new Http\ZendHttpClientDecorator(new ZendHttp\Client());
+        }
         return $this->httpClient;
     }
 
@@ -178,7 +179,7 @@ public function getHttpClient()
      */
     public function setHttpMethodOverride($override = true)
     {
-        static::$httpMethodOverride = $override;
+        $this->httpMethodOverride = $override;
     }
 
     /**
@@ -188,7 +189,7 @@ public function setHttpMethodOverride($override = true)
      */
     public function getHttpMethodOverride()
     {
-        return static::$httpMethodOverride;
+        return $this->httpMethodOverride;
     }
 
     /**
@@ -199,7 +200,7 @@ public function getHttpMethodOverride()
      */
     public function useHttpConditionalGet($bool = true)
     {
-        static::$httpConditionalGet = $bool;
+        $this->httpConditionalGet = $bool;
     }
 
     /**
@@ -397,7 +398,7 @@ public function importFile($filename)
      */
     public function findFeedLinks($uri)
     {
-        $client   = static::getHttpClient();
+        $client   = $this->getHttpClient();
         $response = $client->get($uri);
         if ($response->getStatusCode() !== 200) {
             throw new Exception\RuntimeException("Failed to access $uri, got response code " . $response->getStatusCode());
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 947fc5d1..473543bb 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -240,18 +240,15 @@ public function testGetsFeedLinksAndNormalisesRelativeUrls()
      */
     public function testGetsFeedLinksAndNormalisesRelativeUrlsOnUriWithPath()
     {
-        $currClient = (new Reader\Reader())->getHttpClient();
-
         $testAdapter = new TestAdapter();
         $response = new HttpResponse();
         $response->setStatusCode(200);
         $response->setContent('<!DOCTYPE html><html><head><link rel="alternate" type="application/rss+xml" href="../test.rss"><link rel="alternate" type="application/atom+xml" href="/test.atom"></head><body></body></html>');
         $testAdapter->setResponse($response);
-        (new Reader\Reader())->setHttpClient(new HttpClient(null, ['adapter' => $testAdapter]));
-
-        $links = (new Reader\Reader())->findFeedLinks('http://foo/bar');
 
-        (new Reader\Reader())->setHttpClient($currClient);
+        $reader = new Reader\Reader();
+        $reader->setHttpClient(new HttpClient(null, ['adapter' => $testAdapter]));
+        $links = $reader->findFeedLinks('http://foo/bar');
 
         $this->assertEquals('http://foo/test.rss', $links->rss);
         $this->assertEquals('http://foo/test.atom', $links->atom);
@@ -266,10 +263,12 @@ public function testRegistersUserExtension()
         ));
         $manager->setInvokableClass('JungleBooks\Entry', 'My\Extension\JungleBooks\Entry');
         $manager->setInvokableClass('JungleBooks\Feed', 'My\Extension\JungleBooks\Feed');
-        (new Reader\Reader())->setExtensionManager($manager);
-        (new Reader\Reader())->registerExtension('JungleBooks');
 
-        $this->assertTrue((new Reader\Reader())->isRegistered('JungleBooks'));
+        $reader = new Reader\Reader();
+        $reader->setExtensionManager($manager);
+        $reader->registerExtension('JungleBooks');
+
+        $this->assertTrue($reader->isRegistered('JungleBooks'));
     }
 
     /**
@@ -283,7 +282,7 @@ public function testXxePreventionOnFeedParsing()
         $string = file_get_contents($this->feedSamplePath.'/Reader/xxe-atom10.xml');
         $string = str_replace('XXE_URI', $this->feedSamplePath.'/Reader/xxe-info.txt', $string);
         $feed = (new Reader\Reader())->importString($string);
-        //$this->assertEquals('info:', $feed->getTitle());
+        // $this->assertEquals('info:', $feed->getTitle());
     }
 
     public function testImportRemoteFeedMethodPerformsAsExpected()
@@ -320,15 +319,17 @@ public function testImportStringMethodThrowProperExceptionOnEmptyString()
     public function testSetHttpFeedClient()
     {
         $client = $this->getMock('Zend\Feed\Reader\Http\ClientInterface');
-        (new Reader\Reader())->setHttpClient($client);
-        $this->assertEquals($client, (new Reader\Reader())->getHttpClient());
+        $reader = new Reader\Reader();
+        $reader->setHttpClient($client);
+        $this->assertEquals($client, $reader->getHttpClient());
     }
 
     public function testSetHttpClientWillDecorateAZendHttpClientInstance()
     {
         $client = new HttpClient();
-        (new Reader\Reader())->setHttpClient($client);
-        $cached = (new Reader\Reader())->getHttpClient();
+        $reader = new Reader\Reader();
+        $reader->setHttpClient($client);
+        $cached = $reader->getHttpClient();
         $this->assertInstanceOf(ClientInterface::class, $cached);
         $this->assertAttributeSame($client, 'client', $cached);
     }

From a6889d4f7081cd36469d4277cef256bd07f17d54 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 07:59:36 +0200
Subject: [PATCH 04/15] most tests passed

---
 src/Reader/Entry/AbstractEntry.php            |   2 +-
 src/Reader/Entry/Rss.php                      |   2 +-
 src/Reader/Extension/AbstractEntry.php        |   2 +-
 src/Reader/Extension/AbstractFeed.php         |   2 +-
 src/Reader/Extension/Atom/Entry.php           |   2 +-
 src/Reader/Extension/Atom/Feed.php            |   2 +-
 src/Reader/Extension/DublinCore/Entry.php     |   2 +-
 src/Reader/Extension/DublinCore/Feed.php      |   2 +-
 src/Reader/Feed/AbstractFeed.php              |   2 +-
 src/Reader/Feed/Rss.php                       |   2 +-
 src/Reader/Reader.php                         |   3 +-
 test/Reader/Entry/AtomStandaloneEntryTest.php |  32 +-
 test/Reader/Entry/AtomTest.php                |  76 +--
 test/Reader/Entry/CommonTest.php              |  22 +-
 test/Reader/Entry/RssTest.php                 | 558 ++++++++---------
 test/Reader/Feed/AtomSourceTest.php           |  30 +-
 test/Reader/Feed/AtomTest.php                 |  86 +--
 test/Reader/Feed/CommonTest.php               |  18 +-
 test/Reader/Feed/RssTest.php                  | 568 +++++++++---------
 .../Integration/HOnlineComAtom10Test.php      |  38 +-
 test/Reader/Integration/LautDeRdfTest.php     |  36 +-
 test/Reader/Integration/PodcastRss2Test.php   |  50 +-
 .../Integration/WordpressAtom10Test.php       |  38 +-
 .../Integration/WordpressRss2DcAtomTest.php   |  38 +-
 24 files changed, 807 insertions(+), 806 deletions(-)

diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index 5333d5bc..719a5e5a 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -74,7 +74,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         if ($type !== null) {
             $this->data['type'] = $type;
         } elseif ($this->domDocument !== null) {
-            $this->data['type'] = Reader\Reader::detectType($this->domDocument);
+            $this->data['type'] = (new Reader\Reader())->detectType($this->domDocument);
         } else {
             $this->data['type'] = Reader\Reader::TYPE_ANY;
         }
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index 4333e098..956a0220 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -125,7 +125,7 @@ public function getAuthors()
             $authors = $this->getExtension('Atom')->getAuthors();
         } else {
             $authors = new Reader\Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index c589146a..35848552 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -159,7 +159,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if ($type === null) {
-            $type = Reader\Reader::detectType($this->getEntryElement(), true);
+            $type = (new Reader\Reader())->detectType($this->getEntryElement(), true);
             $this->setType($type);
         }
 
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index d61414a2..09069e12 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -99,7 +99,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if (null === $type) {
-            $type = Reader\Reader::detectType($this->getDomDocument());
+            $type = (new Reader\Reader())->detectType($this->getDomDocument());
             $this->setType($type);
         }
         return $type;
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index 9d06ad3b..d38e5c98 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -71,7 +71,7 @@ public function getAuthors()
             $authors = new Collection\Author();
         } else {
             $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
index dc5a59f7..1cf4ef0f 100644
--- a/src/Reader/Extension/Atom/Feed.php
+++ b/src/Reader/Extension/Atom/Feed.php
@@ -63,7 +63,7 @@ public function getAuthors()
             $authors = new Collection\Author();
         } else {
             $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index 1b42f581..a9d4f576 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -65,7 +65,7 @@ public function getAuthors()
                 ];
             }
             $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         } else {
             $authors = null;
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index 9e339588..48b555eb 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -65,7 +65,7 @@ public function getAuthors()
                 ];
             }
             $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         } else {
             $authors = null;
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 86ad207b..03b219f2 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -82,7 +82,7 @@ public function __construct(DOMDocument $domDocument, $type = null)
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = Reader\Reader::detectType($this->domDocument);
+            $this->data['type'] = (new Reader\Reader())->detectType($this->domDocument);
         }
         $this->registerNamespaces();
         $this->indexEntries();
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 6f17ae4d..5604993b 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -122,7 +122,7 @@ public function getAuthors()
             $authors = $this->getExtension('Atom')->getAuthors();
         } else {
             $authors = new Reader\Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                (new Reader\Reader())->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index a3900e10..8d8f5c39 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -354,7 +354,7 @@ public function importString($string)
             throw new Exception\RuntimeException($errormsg);
         }
 
-        $type = static::detectType($dom);
+        $type = $this->detectType($dom);
 
         static::registerCoreExtensions();
 
@@ -655,6 +655,7 @@ protected function registerCoreExtensions()
      *
      * @param array
      * @return array
+     * @todo migrate somehwre because that's remove trans-classses functionality
      */
     public function arrayUnique(array $array)
     {
diff --git a/test/Reader/Entry/AtomStandaloneEntryTest.php b/test/Reader/Entry/AtomStandaloneEntryTest.php
index 59ad066b..3b3256e0 100644
--- a/test/Reader/Entry/AtomStandaloneEntryTest.php
+++ b/test/Reader/Entry/AtomStandaloneEntryTest.php
@@ -61,7 +61,7 @@ public function setup()
 
     public function testReaderImportOfAtomEntryDocumentReturnsEntryClass()
     {
-        $object = Reader\Reader::importString(
+        $object = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/id/atom10.xml')
         );
         $this->assertInstanceOf('Zend\Feed\Reader\Entry\Atom', $object);
@@ -73,7 +73,7 @@ public function testReaderImportOfAtomEntryDocumentReturnsEntryClass()
      */
     public function testGetsIdFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/id/atom10.xml')
         );
         $this->assertEquals('1', $entry->getId());
@@ -85,7 +85,7 @@ public function testGetsIdFromAtom10()
      */
     public function testGetsDateCreatedFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/atom10.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -98,7 +98,7 @@ public function testGetsDateCreatedFromAtom10()
      */
     public function testGetsDateModifiedFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/atom10.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -111,7 +111,7 @@ public function testGetsDateModifiedFromAtom10()
      */
     public function testGetsTitleFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/title/atom10.xml')
         );
         $this->assertEquals('Entry Title', $entry->getTitle());
@@ -123,7 +123,7 @@ public function testGetsTitleFromAtom10()
      */
     public function testGetsAuthorsFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/atom10.xml')
         );
 
@@ -145,7 +145,7 @@ public function testGetsAuthorsFromAtom10()
      */
     public function testGetsAuthorFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/atom10.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com', 'uri'=>'http://www.example.com'], $entry->getAuthor());
@@ -157,7 +157,7 @@ public function testGetsAuthorFromAtom10()
      */
     public function testGetsDescriptionFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/description/atom10.xml')
         );
         $this->assertEquals('Entry Description', $entry->getDescription());
@@ -169,7 +169,7 @@ public function testGetsDescriptionFromAtom10()
      */
     public function testGetsEnclosureFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/enclosure/atom10.xml')
         );
 
@@ -187,7 +187,7 @@ public function testGetsEnclosureFromAtom10()
      */
     public function testGetsContentFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/atom10.xml')
         );
         $this->assertEquals('Entry Content &amp;', $entry->getContent());
@@ -199,7 +199,7 @@ public function testGetsContentFromAtom10()
      */
     public function testGetsContentFromAtom10Html()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/atom10_Html.xml')
         );
         $this->assertEquals('<p>Entry Content &amp;</p>', $entry->getContent());
@@ -211,7 +211,7 @@ public function testGetsContentFromAtom10Html()
      */
     public function testGetsContentFromAtom10HtmlCdata()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/atom10_HtmlCdata.xml')
         );
         $this->assertEquals('<p>Entry Content &amp;</p>', $entry->getContent());
@@ -223,7 +223,7 @@ public function testGetsContentFromAtom10HtmlCdata()
      */
     public function testGetsContentFromAtom10XhtmlNamespaced()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/atom10_Xhtml.xml')
         );
         $this->assertEquals('<p class="x:"><em>Entry Content &amp;x:</em></p>', $entry->getContent());
@@ -235,7 +235,7 @@ public function testGetsContentFromAtom10XhtmlNamespaced()
      */
     public function testGetsLinkFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/link/atom10.xml')
         );
         $this->assertEquals('http://www.example.com/entry', $entry->getLink());
@@ -247,7 +247,7 @@ public function testGetsLinkFromAtom10()
      */
     public function testGetsCommentLinkFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/commentlink/atom10.xml')
         );
         $this->assertEquals('http://www.example.com/entry/comments', $entry->getCommentLink());
@@ -259,7 +259,7 @@ public function testGetsCommentLinkFromAtom10()
      */
     public function testGetsCategoriesFromAtom10()
     {
-        $entry = Reader\Reader::importString(
+        $entry = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/atom10.xml')
         );
         $this->assertEquals($this->expectedCats, (array) $entry->getCategories());
diff --git a/test/Reader/Entry/AtomTest.php b/test/Reader/Entry/AtomTest.php
index 399edcd2..51c8285c 100644
--- a/test/Reader/Entry/AtomTest.php
+++ b/test/Reader/Entry/AtomTest.php
@@ -64,7 +64,7 @@ public function setup()
      */
     public function testGetsIdFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/id/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -73,7 +73,7 @@ public function testGetsIdFromAtom03()
 
     public function testGetsIdFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/id/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -85,7 +85,7 @@ public function testGetsIdFromAtom10()
      */
     public function testGetsDateCreatedFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -95,7 +95,7 @@ public function testGetsDateCreatedFromAtom03()
 
     public function testGetsDateCreatedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -105,7 +105,7 @@ public function testGetsDateCreatedFromAtom10()
 
     public function testGetsDateCreatedWithFractional()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/plain/fractional.xml')
         );
         $entry = $feed->current();
@@ -118,7 +118,7 @@ public function testGetsDateCreatedWithFractional()
      */
     public function testGetsDateModifiedFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -128,7 +128,7 @@ public function testGetsDateModifiedFromAtom03()
 
     public function testGetsDateModifiedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -138,7 +138,7 @@ public function testGetsDateModifiedFromAtom10()
 
     public function testGetsDateModifiedWithFractional()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/plain/fractional.xml')
         );
         $entry = $feed->current();
@@ -151,7 +151,7 @@ public function testGetsDateModifiedWithFractional()
      */
     public function testGetsTitleFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/title/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -160,7 +160,7 @@ public function testGetsTitleFromAtom03()
 
     public function testGetsTitleFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/title/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -172,7 +172,7 @@ public function testGetsTitleFromAtom10()
      */
     public function testGetsAuthorsFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/plain/atom03.xml')
         );
 
@@ -191,7 +191,7 @@ public function testGetsAuthorsFromAtom03()
 
     public function testGetsAuthorsFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/plain/atom10.xml')
         );
 
@@ -213,7 +213,7 @@ public function testGetsAuthorsFromAtom10()
      */
     public function testGetsAuthorFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -222,7 +222,7 @@ public function testGetsAuthorFromAtom03()
 
     public function testGetsAuthorFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/author/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -234,7 +234,7 @@ public function testGetsAuthorFromAtom10()
      */
     public function testGetsDescriptionFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/description/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -243,7 +243,7 @@ public function testGetsDescriptionFromAtom03()
 
     public function testGetsDescriptionFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/description/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -255,7 +255,7 @@ public function testGetsDescriptionFromAtom10()
      */
     public function testGetsEnclosureFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/enclosure/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -270,7 +270,7 @@ public function testGetsEnclosureFromAtom03()
 
     public function testGetsEnclosureFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/enclosure/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -288,7 +288,7 @@ public function testGetsEnclosureFromAtom10()
      */
     public function testGetsContentFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -301,7 +301,7 @@ public function testGetsContentFromAtom03()
      */
     public function testGetsContentFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -314,7 +314,7 @@ public function testGetsContentFromAtom10()
      */
     public function testGetsContentFromAtom10Html()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/plain/atom10_Html.xml')
         );
         $entry = $feed->current();
@@ -327,7 +327,7 @@ public function testGetsContentFromAtom10Html()
      */
     public function testGetsContentFromAtom10HtmlCdata()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/plain/atom10_HtmlCdata.xml')
         );
         $entry = $feed->current();
@@ -340,7 +340,7 @@ public function testGetsContentFromAtom10HtmlCdata()
      */
     public function testGetsContentFromAtom10XhtmlNamespaced()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/content/plain/atom10_Xhtml.xml')
         );
         $entry = $feed->current();
@@ -352,7 +352,7 @@ public function testGetsContentFromAtom10XhtmlNamespaced()
      */
     public function testGetsLinkFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/link/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -361,7 +361,7 @@ public function testGetsLinkFromAtom03()
 
     public function testGetsLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/link/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -370,7 +370,7 @@ public function testGetsLinkFromAtom10()
 
     public function testGetsLinkFromAtom10_WithNoRelAttribute()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/link/plain/atom10-norel.xml')
         );
         $entry = $feed->current();
@@ -379,7 +379,7 @@ public function testGetsLinkFromAtom10_WithNoRelAttribute()
 
     public function testGetsLinkFromAtom10_WithRelativeUrl()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/link/plain/atom10-relative.xml')
         );
         $entry = $feed->current();
@@ -391,7 +391,7 @@ public function testGetsLinkFromAtom10_WithRelativeUrl()
      */
     public function testGetsBaseUriFromAtom10_FromFeedElement()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/baseurl/plain/atom10-feedlevel.xml')
         );
         $entry = $feed->current();
@@ -400,7 +400,7 @@ public function testGetsBaseUriFromAtom10_FromFeedElement()
 
     public function testGetsBaseUriFromAtom10_FromEntryElement()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/baseurl/plain/atom10-entrylevel.xml')
         );
         $entry = $feed->current();
@@ -412,7 +412,7 @@ public function testGetsBaseUriFromAtom10_FromEntryElement()
      */
     public function testGetsCommentLinkFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/commentlink/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -421,7 +421,7 @@ public function testGetsCommentLinkFromAtom03()
 
     public function testGetsCommentLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/commentlink/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -430,7 +430,7 @@ public function testGetsCommentLinkFromAtom10()
 
     public function testGetsCommentLinkFromAtom10_RelativeLinks()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/commentlink/plain/atom10-relative.xml')
         );
         $entry = $feed->current();
@@ -445,7 +445,7 @@ public function testGetsCommentLinkFromAtom10_RelativeLinks()
 
     public function testGetsCategoriesFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10.xml')
         );
         $entry = $feed->current();
@@ -455,7 +455,7 @@ public function testGetsCategoriesFromAtom10()
 
     public function testGetsCategoriesFromAtom03_Atom10Extension()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom03.xml')
         );
         $entry = $feed->current();
@@ -467,7 +467,7 @@ public function testGetsCategoriesFromAtom03_Atom10Extension()
 
     public function testGetsCategoriesFromAtom03_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/atom03.xml')
         );
         $entry = $feed->current();
@@ -477,7 +477,7 @@ public function testGetsCategoriesFromAtom03_Dc10()
 
     public function testGetsCategoriesFromAtom03_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/atom03.xml')
         );
         $entry = $feed->current();
@@ -489,7 +489,7 @@ public function testGetsCategoriesFromAtom03_Dc11()
 
     public function testGetsCategoriesFromAtom10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/atom10.xml')
         );
         $entry = $feed->current();
@@ -499,7 +499,7 @@ public function testGetsCategoriesFromAtom10_None()
 
     public function testGetsCategoriesFromAtom03_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/atom03.xml')
         );
         $entry = $feed->current();
diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
index 2d2b72a4..ccca7f6e 100644
--- a/test/Reader/Entry/CommonTest.php
+++ b/test/Reader/Entry/CommonTest.php
@@ -29,7 +29,7 @@ public function setup()
      */
     public function testGetsDomDocumentObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -38,7 +38,7 @@ public function testGetsDomDocumentObject()
 
     public function testGetsDomXpathObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -47,7 +47,7 @@ public function testGetsDomXpathObject()
 
     public function testGetsXpathPrefixString()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -56,7 +56,7 @@ public function testGetsXpathPrefixString()
 
     public function testGetsDomElementObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -65,7 +65,7 @@ public function testGetsDomElementObject()
 
     public function testSaveXmlOutputsXmlStringForEntry()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -76,7 +76,7 @@ public function testSaveXmlOutputsXmlStringForEntry()
 
     public function testGetsNamedExtension()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -85,7 +85,7 @@ public function testGetsNamedExtension()
 
     public function testReturnsNullIfExtensionDoesNotExist()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -97,7 +97,7 @@ public function testReturnsNullIfExtensionDoesNotExist()
      */
     public function testReturnsEncodingOfFeed()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -109,7 +109,7 @@ public function testReturnsEncodingOfFeed()
      */
     public function testReturnsEncodingOfFeedAsUtf8IfUndefined()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom_noencodingdefined.xml')
         );
         $entry = $feed->current();
@@ -121,7 +121,7 @@ public function testReturnsEncodingOfFeedAsUtf8IfUndefined()
     */
     public function testFeedEntryCanDetectFeedType()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
@@ -137,7 +137,7 @@ public function testFeedEntryCanDetectFeedType()
     */
     public function testFeedEntryCanSetAnyType()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $entry = $feed->current();
diff --git a/test/Reader/Entry/RssTest.php b/test/Reader/Entry/RssTest.php
index 86bbacb3..8e870baf 100644
--- a/test/Reader/Entry/RssTest.php
+++ b/test/Reader/Entry/RssTest.php
@@ -83,7 +83,7 @@ public function setup()
      */
     public function testGetsIdFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -92,7 +92,7 @@ public function testGetsIdFromRss20()
 
     public function testGetsIdFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -101,7 +101,7 @@ public function testGetsIdFromRss094()
 
     public function testGetsIdFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -110,7 +110,7 @@ public function testGetsIdFromRss093()
 
     public function testGetsIdFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -119,7 +119,7 @@ public function testGetsIdFromRss092()
 
     public function testGetsIdFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -128,7 +128,7 @@ public function testGetsIdFromRss091()
 
     public function testGetsIdFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -137,7 +137,7 @@ public function testGetsIdFromRss10()
 
     public function testGetsIdFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -148,7 +148,7 @@ public function testGetsIdFromRss090()
 
     public function testGetsIdFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss20.xml')
         );
         $entry = $feed->current();
@@ -157,7 +157,7 @@ public function testGetsIdFromRss20_Dc10()
 
     public function testGetsIdFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -166,7 +166,7 @@ public function testGetsIdFromRss094_Dc10()
 
     public function testGetsIdFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -175,7 +175,7 @@ public function testGetsIdFromRss093_Dc10()
 
     public function testGetsIdFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -184,7 +184,7 @@ public function testGetsIdFromRss092_Dc10()
 
     public function testGetsIdFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -193,7 +193,7 @@ public function testGetsIdFromRss091_Dc10()
 
     public function testGetsIdFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -202,7 +202,7 @@ public function testGetsIdFromRss10_Dc10()
 
     public function testGetsIdFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -213,7 +213,7 @@ public function testGetsIdFromRss090_Dc10()
 
     public function testGetsIdFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss20.xml')
         );
         $entry = $feed->current();
@@ -222,7 +222,7 @@ public function testGetsIdFromRss20_Dc11()
 
     public function testGetsIdFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -231,7 +231,7 @@ public function testGetsIdFromRss094_Dc11()
 
     public function testGetsIdFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -240,7 +240,7 @@ public function testGetsIdFromRss093_Dc11()
 
     public function testGetsIdFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -249,7 +249,7 @@ public function testGetsIdFromRss092_Dc11()
 
     public function testGetsIdFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -258,7 +258,7 @@ public function testGetsIdFromRss091_Dc11()
 
     public function testGetsIdFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -267,7 +267,7 @@ public function testGetsIdFromRss10_Dc11()
 
     public function testGetsIdFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -278,7 +278,7 @@ public function testGetsIdFromRss090_Dc11()
 
     public function testGetsIdFromRss20_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss20.xml')
         );
         $entry = $feed->current();
@@ -287,7 +287,7 @@ public function testGetsIdFromRss20_Title()
 
     public function testGetsIdFromRss094_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss094.xml')
         );
         $entry = $feed->current();
@@ -296,7 +296,7 @@ public function testGetsIdFromRss094_Title()
 
     public function testGetsIdFromRss093_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss093.xml')
         );
         $entry = $feed->current();
@@ -305,7 +305,7 @@ public function testGetsIdFromRss093_Title()
 
     public function testGetsIdFromRss092_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss092.xml')
         );
         $entry = $feed->current();
@@ -314,7 +314,7 @@ public function testGetsIdFromRss092_Title()
 
     public function testGetsIdFromRss091_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss091.xml')
         );
         $entry = $feed->current();
@@ -323,7 +323,7 @@ public function testGetsIdFromRss091_Title()
 
     public function testGetsIdFromRss10_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss10.xml')
         );
         $entry = $feed->current();
@@ -332,7 +332,7 @@ public function testGetsIdFromRss10_Title()
 
     public function testGetsIdFromRss090_Title()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/title/rss090.xml')
         );
         $entry = $feed->current();
@@ -343,7 +343,7 @@ public function testGetsIdFromRss090_Title()
 
     public function testGetsIdFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -352,7 +352,7 @@ public function testGetsIdFromRss20_None()
 
     public function testGetsIdFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -361,7 +361,7 @@ public function testGetsIdFromRss094_None()
 
     public function testGetsIdFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -370,7 +370,7 @@ public function testGetsIdFromRss093_None()
 
     public function testGetsIdFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -379,7 +379,7 @@ public function testGetsIdFromRss092_None()
 
     public function testGetsIdFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -388,7 +388,7 @@ public function testGetsIdFromRss091_None()
 
     public function testGetsIdFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -397,7 +397,7 @@ public function testGetsIdFromRss10_None()
 
     public function testGetsIdFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -409,7 +409,7 @@ public function testGetsIdFromRss090_None()
      */
     public function testGetsTitleFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -418,7 +418,7 @@ public function testGetsTitleFromRss20()
 
     public function testGetsTitleFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -427,7 +427,7 @@ public function testGetsTitleFromRss094()
 
     public function testGetsTitleFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -436,7 +436,7 @@ public function testGetsTitleFromRss093()
 
     public function testGetsTitleFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -445,7 +445,7 @@ public function testGetsTitleFromRss092()
 
     public function testGetsTitleFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -454,7 +454,7 @@ public function testGetsTitleFromRss091()
 
     public function testGetsTitleFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -463,7 +463,7 @@ public function testGetsTitleFromRss10()
 
     public function testGetsTitleFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -474,7 +474,7 @@ public function testGetsTitleFromRss090()
 
     public function testGetsTitleFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss20.xml')
         );
         $entry = $feed->current();
@@ -483,7 +483,7 @@ public function testGetsTitleFromRss20_Dc10()
 
     public function testGetsTitleFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -492,7 +492,7 @@ public function testGetsTitleFromRss094_Dc10()
 
     public function testGetsTitleFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -501,7 +501,7 @@ public function testGetsTitleFromRss093_Dc10()
 
     public function testGetsTitleFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -510,7 +510,7 @@ public function testGetsTitleFromRss092_Dc10()
 
     public function testGetsTitleFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -519,7 +519,7 @@ public function testGetsTitleFromRss091_Dc10()
 
     public function testGetsTitleFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -528,7 +528,7 @@ public function testGetsTitleFromRss10_Dc10()
 
     public function testGetsTitleFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -539,7 +539,7 @@ public function testGetsTitleFromRss090_Dc10()
 
     public function testGetsTitleFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss20.xml')
         );
         $entry = $feed->current();
@@ -548,7 +548,7 @@ public function testGetsTitleFromRss20_Dc11()
 
     public function testGetsTitleFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -557,7 +557,7 @@ public function testGetsTitleFromRss094_Dc11()
 
     public function testGetsTitleFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -566,7 +566,7 @@ public function testGetsTitleFromRss093_Dc11()
 
     public function testGetsTitleFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -575,7 +575,7 @@ public function testGetsTitleFromRss092_Dc11()
 
     public function testGetsTitleFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -584,7 +584,7 @@ public function testGetsTitleFromRss091_Dc11()
 
     public function testGetsTitleFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -593,7 +593,7 @@ public function testGetsTitleFromRss10_Dc11()
 
     public function testGetsTitleFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -604,7 +604,7 @@ public function testGetsTitleFromRss090_Dc11()
 
     public function testGetsTitleFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -613,7 +613,7 @@ public function testGetsTitleFromRss20_None()
 
     public function testGetsTitleFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -622,7 +622,7 @@ public function testGetsTitleFromRss094_None()
 
     public function testGetsTitleFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -631,7 +631,7 @@ public function testGetsTitleFromRss093_None()
 
     public function testGetsTitleFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -640,7 +640,7 @@ public function testGetsTitleFromRss092_None()
 
     public function testGetsTitleFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -649,7 +649,7 @@ public function testGetsTitleFromRss091_None()
 
     public function testGetsTitleFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -658,7 +658,7 @@ public function testGetsTitleFromRss10_None()
 
     public function testGetsTitleFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -670,7 +670,7 @@ public function testGetsTitleFromRss090_None()
      */
     public function testGetsAuthorsFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -683,7 +683,7 @@ public function testGetsAuthorsFromRss20()
 
     public function testGetsAuthorsFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -692,7 +692,7 @@ public function testGetsAuthorsFromRss094()
 
     public function testGetsAuthorsFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -701,7 +701,7 @@ public function testGetsAuthorsFromRss093()
 
     public function testGetsAuthorsFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -710,7 +710,7 @@ public function testGetsAuthorsFromRss092()
 
     public function testGetsAuthorsFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -719,7 +719,7 @@ public function testGetsAuthorsFromRss091()
 
     public function testGetsAuthorsFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -728,7 +728,7 @@ public function testGetsAuthorsFromRss10()
 
     public function testGetsAuthorsFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -739,7 +739,7 @@ public function testGetsAuthorsFromRss090()
 
     public function testGetsAuthorsFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss20.xml')
         );
         $entry = $feed->current();
@@ -751,7 +751,7 @@ public function testGetsAuthorsFromRss20_Dc10()
 
     public function testGetsAuthorsFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -763,7 +763,7 @@ public function testGetsAuthorsFromRss094_Dc10()
 
     public function testGetsAuthorsFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -775,7 +775,7 @@ public function testGetsAuthorsFromRss093_Dc10()
 
     public function testGetsAuthorsFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -787,7 +787,7 @@ public function testGetsAuthorsFromRss092_Dc10()
 
     public function testGetsAuthorsFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -799,7 +799,7 @@ public function testGetsAuthorsFromRss091_Dc10()
 
     public function testGetsAuthorsFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -811,7 +811,7 @@ public function testGetsAuthorsFromRss10_Dc10()
 
     public function testGetsAuthorsFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -825,7 +825,7 @@ public function testGetsAuthorsFromRss090_Dc10()
 
     public function testGetsAuthorsFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss20.xml')
         );
         $entry = $feed->current();
@@ -837,7 +837,7 @@ public function testGetsAuthorsFromRss20_Dc11()
 
     public function testGetsAuthorsFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -849,7 +849,7 @@ public function testGetsAuthorsFromRss094_Dc11()
 
     public function testGetsAuthorsFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -861,7 +861,7 @@ public function testGetsAuthorsFromRss093_Dc11()
 
     public function testGetsAuthorsFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -873,7 +873,7 @@ public function testGetsAuthorsFromRss092_Dc11()
 
     public function testGetsAuthorsFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -885,7 +885,7 @@ public function testGetsAuthorsFromRss091_Dc11()
 
     public function testGetsAuthorsFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -897,7 +897,7 @@ public function testGetsAuthorsFromRss10_Dc11()
 
     public function testGetsAuthorsFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -911,7 +911,7 @@ public function testGetsAuthorsFromRss090_Dc11()
 
     public function testGetsAuthorsFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -920,7 +920,7 @@ public function testGetsAuthorsFromRss20_None()
 
     public function testGetsAuthorsFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -929,7 +929,7 @@ public function testGetsAuthorsFromRss094_None()
 
     public function testGetsAuthorsFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -938,7 +938,7 @@ public function testGetsAuthorsFromRss093_None()
 
     public function testGetsAuthorsFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -947,7 +947,7 @@ public function testGetsAuthorsFromRss092_None()
 
     public function testGetsAuthorsFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -956,7 +956,7 @@ public function testGetsAuthorsFromRss091_None()
 
     public function testGetsAuthorsFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -965,7 +965,7 @@ public function testGetsAuthorsFromRss10_None()
 
     public function testGetsAuthorsFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -978,7 +978,7 @@ public function testGetsAuthorsFromRss090_None()
      */
     public function testGetsAuthorFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -987,7 +987,7 @@ public function testGetsAuthorFromRss20()
 
     public function testGetsAuthorFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -996,7 +996,7 @@ public function testGetsAuthorFromRss094()
 
     public function testGetsAuthorFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -1005,7 +1005,7 @@ public function testGetsAuthorFromRss093()
 
     public function testGetsAuthorFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -1014,7 +1014,7 @@ public function testGetsAuthorFromRss092()
 
     public function testGetsAuthorFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -1023,7 +1023,7 @@ public function testGetsAuthorFromRss091()
 
     public function testGetsAuthorFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -1032,7 +1032,7 @@ public function testGetsAuthorFromRss10()
 
     public function testGetsAuthorFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -1043,7 +1043,7 @@ public function testGetsAuthorFromRss090()
 
     public function testGetsAuthorFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss20.xml')
         );
         $entry = $feed->current();
@@ -1052,7 +1052,7 @@ public function testGetsAuthorFromRss20_Dc10()
 
     public function testGetsAuthorFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -1061,7 +1061,7 @@ public function testGetsAuthorFromRss094_Dc10()
 
     public function testGetsAuthorFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -1070,7 +1070,7 @@ public function testGetsAuthorFromRss093_Dc10()
 
     public function testGetsAuthorFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -1079,7 +1079,7 @@ public function testGetsAuthorFromRss092_Dc10()
 
     public function testGetsAuthorFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -1088,7 +1088,7 @@ public function testGetsAuthorFromRss091_Dc10()
 
     public function testGetsAuthorFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -1097,7 +1097,7 @@ public function testGetsAuthorFromRss10_Dc10()
 
     public function testGetsAuthorFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -1108,7 +1108,7 @@ public function testGetsAuthorFromRss090_Dc10()
 
     public function testGetsAuthorFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss20.xml')
         );
         $entry = $feed->current();
@@ -1117,7 +1117,7 @@ public function testGetsAuthorFromRss20_Dc11()
 
     public function testGetsAuthorFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -1126,7 +1126,7 @@ public function testGetsAuthorFromRss094_Dc11()
 
     public function testGetsAuthorFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -1135,7 +1135,7 @@ public function testGetsAuthorFromRss093_Dc11()
 
     public function testGetsAuthorFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -1144,7 +1144,7 @@ public function testGetsAuthorFromRss092_Dc11()
 
     public function testGetsAuthorFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -1153,7 +1153,7 @@ public function testGetsAuthorFromRss091_Dc11()
 
     public function testGetsAuthorFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -1162,7 +1162,7 @@ public function testGetsAuthorFromRss10_Dc11()
 
     public function testGetsAuthorFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -1173,7 +1173,7 @@ public function testGetsAuthorFromRss090_Dc11()
 
     public function testGetsAuthorFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -1182,7 +1182,7 @@ public function testGetsAuthorFromRss20_None()
 
     public function testGetsAuthorFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -1191,7 +1191,7 @@ public function testGetsAuthorFromRss094_None()
 
     public function testGetsAuthorFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -1200,7 +1200,7 @@ public function testGetsAuthorFromRss093_None()
 
     public function testGetsAuthorFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -1209,7 +1209,7 @@ public function testGetsAuthorFromRss092_None()
 
     public function testGetsAuthorFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -1218,7 +1218,7 @@ public function testGetsAuthorFromRss091_None()
 
     public function testGetsAuthorFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -1227,7 +1227,7 @@ public function testGetsAuthorFromRss10_None()
 
     public function testGetsAuthorFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -1239,7 +1239,7 @@ public function testGetsAuthorFromRss090_None()
      */
     public function testGetsDescriptionFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -1248,7 +1248,7 @@ public function testGetsDescriptionFromRss20()
 
     public function testGetsDescriptionFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -1257,7 +1257,7 @@ public function testGetsDescriptionFromRss094()
 
     public function testGetsDescriptionFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -1266,7 +1266,7 @@ public function testGetsDescriptionFromRss093()
 
     public function testGetsDescriptionFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -1275,7 +1275,7 @@ public function testGetsDescriptionFromRss092()
 
     public function testGetsDescriptionFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -1284,7 +1284,7 @@ public function testGetsDescriptionFromRss091()
 
     public function testGetsDescriptionFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -1293,7 +1293,7 @@ public function testGetsDescriptionFromRss10()
 
     public function testGetsDescriptionFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -1304,7 +1304,7 @@ public function testGetsDescriptionFromRss090()
 
     public function testGetsDescriptionFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss20.xml')
         );
         $entry = $feed->current();
@@ -1313,7 +1313,7 @@ public function testGetsDescriptionFromRss20_Dc10()
 
     public function testGetsDescriptionFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -1322,7 +1322,7 @@ public function testGetsDescriptionFromRss094_Dc10()
 
     public function testGetsDescriptionFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -1331,7 +1331,7 @@ public function testGetsDescriptionFromRss093_Dc10()
 
     public function testGetsDescriptionFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -1340,7 +1340,7 @@ public function testGetsDescriptionFromRss092_Dc10()
 
     public function testGetsDescriptionFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -1349,7 +1349,7 @@ public function testGetsDescriptionFromRss091_Dc10()
 
     public function testGetsDescriptionFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -1358,7 +1358,7 @@ public function testGetsDescriptionFromRss10_Dc10()
 
     public function testGetsDescriptionFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -1369,7 +1369,7 @@ public function testGetsDescriptionFromRss090_Dc10()
 
     public function testGetsDescriptionFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss20.xml')
         );
         $entry = $feed->current();
@@ -1378,7 +1378,7 @@ public function testGetsDescriptionFromRss20_Dc11()
 
     public function testGetsDescriptionFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -1387,7 +1387,7 @@ public function testGetsDescriptionFromRss094_Dc11()
 
     public function testGetsDescriptionFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -1396,7 +1396,7 @@ public function testGetsDescriptionFromRss093_Dc11()
 
     public function testGetsDescriptionFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -1405,7 +1405,7 @@ public function testGetsDescriptionFromRss092_Dc11()
 
     public function testGetsDescriptionFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -1414,7 +1414,7 @@ public function testGetsDescriptionFromRss091_Dc11()
 
     public function testGetsDescriptionFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -1423,7 +1423,7 @@ public function testGetsDescriptionFromRss10_Dc11()
 
     public function testGetsDescriptionFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -1434,7 +1434,7 @@ public function testGetsDescriptionFromRss090_Dc11()
 
     public function testGetsDescriptionFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -1443,7 +1443,7 @@ public function testGetsDescriptionFromRss20_None()
 
     public function testGetsDescriptionFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -1452,7 +1452,7 @@ public function testGetsDescriptionFromRss094_None()
 
     public function testGetsDescriptionFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -1461,7 +1461,7 @@ public function testGetsDescriptionFromRss093_None()
 
     public function testGetsDescriptionFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -1470,7 +1470,7 @@ public function testGetsDescriptionFromRss092_None()
 
     public function testGetsDescriptionFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -1479,7 +1479,7 @@ public function testGetsDescriptionFromRss091_None()
 
     public function testGetsDescriptionFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -1488,7 +1488,7 @@ public function testGetsDescriptionFromRss10_None()
 
     public function testGetsDescriptionFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -1500,7 +1500,7 @@ public function testGetsDescriptionFromRss090_None()
      */
     public function testGetsEnclosureFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/enclosure/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -1515,7 +1515,7 @@ public function testGetsEnclosureFromRss20()
 
     public function testGetsEnclosureFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/enclosure/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -1527,7 +1527,7 @@ public function testGetsEnclosureFromRss10()
      */
     public function testGetsContentFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -1536,7 +1536,7 @@ public function testGetsContentFromRss20()
 
     public function testGetsContentFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -1545,7 +1545,7 @@ public function testGetsContentFromRss094()
 
     public function testGetsContentFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -1554,7 +1554,7 @@ public function testGetsContentFromRss093()
 
     public function testGetsContentFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -1563,7 +1563,7 @@ public function testGetsContentFromRss092()
 
     public function testGetsContentFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -1572,7 +1572,7 @@ public function testGetsContentFromRss091()
 
     public function testGetsContentFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -1581,7 +1581,7 @@ public function testGetsContentFromRss10()
 
     public function testGetsContentFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -1592,7 +1592,7 @@ public function testGetsContentFromRss090()
 
     public function testGetsContentFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss20.xml')
         );
         $entry = $feed->current();
@@ -1601,7 +1601,7 @@ public function testGetsContentFromRss20_Dc10()
 
     public function testGetsContentFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss094.xml')
         );
         $entry = $feed->current();
@@ -1610,7 +1610,7 @@ public function testGetsContentFromRss094_Dc10()
 
     public function testGetsContentFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss093.xml')
         );
         $entry = $feed->current();
@@ -1619,7 +1619,7 @@ public function testGetsContentFromRss093_Dc10()
 
     public function testGetsContentFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss092.xml')
         );
         $entry = $feed->current();
@@ -1628,7 +1628,7 @@ public function testGetsContentFromRss092_Dc10()
 
     public function testGetsContentFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss091.xml')
         );
         $entry = $feed->current();
@@ -1637,7 +1637,7 @@ public function testGetsContentFromRss091_Dc10()
 
     public function testGetsContentFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss10.xml')
         );
         $entry = $feed->current();
@@ -1646,7 +1646,7 @@ public function testGetsContentFromRss10_Dc10()
 
     public function testGetsContentFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/description/rss090.xml')
         );
         $entry = $feed->current();
@@ -1657,7 +1657,7 @@ public function testGetsContentFromRss090_Dc10()
 
     public function testGetsContentFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -1666,7 +1666,7 @@ public function testGetsContentFromRss20_None()
 
     public function testGetsContentFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -1675,7 +1675,7 @@ public function testGetsContentFromRss094_None()
 
     public function testGetsContentFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -1684,7 +1684,7 @@ public function testGetsContentFromRss093_None()
 
     public function testGetsContentFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -1693,7 +1693,7 @@ public function testGetsContentFromRss092_None()
 
     public function testGetsContentFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -1702,7 +1702,7 @@ public function testGetsContentFromRss091_None()
 
     public function testGetsContentFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -1711,7 +1711,7 @@ public function testGetsContentFromRss10_None()
 
     public function testGetsContentFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/content/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -1723,7 +1723,7 @@ public function testGetsContentFromRss090_None()
      */
     public function testGetsLinkFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -1732,7 +1732,7 @@ public function testGetsLinkFromRss20()
 
     public function testGetsLinkFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -1741,7 +1741,7 @@ public function testGetsLinkFromRss094()
 
     public function testGetsLinkFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -1750,7 +1750,7 @@ public function testGetsLinkFromRss093()
 
     public function testGetsLinkFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -1759,7 +1759,7 @@ public function testGetsLinkFromRss092()
 
     public function testGetsLinkFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -1768,7 +1768,7 @@ public function testGetsLinkFromRss091()
 
     public function testGetsLinkFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss10.xml')
         );
         $entry = $feed->current();
@@ -1777,7 +1777,7 @@ public function testGetsLinkFromRss10()
 
     public function testGetsLinkFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss090.xml')
         );
         $entry = $feed->current();
@@ -1788,7 +1788,7 @@ public function testGetsLinkFromRss090()
 
     public function testGetsLinkFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -1797,7 +1797,7 @@ public function testGetsLinkFromRss20_None()
 
     public function testGetsLinkFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -1806,7 +1806,7 @@ public function testGetsLinkFromRss094_None()
 
     public function testGetsLinkFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -1815,7 +1815,7 @@ public function testGetsLinkFromRss093_None()
 
     public function testGetsLinkFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -1824,7 +1824,7 @@ public function testGetsLinkFromRss092_None()
 
     public function testGetsLinkFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -1833,7 +1833,7 @@ public function testGetsLinkFromRss091_None()
 
     public function testGetsLinkFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -1842,7 +1842,7 @@ public function testGetsLinkFromRss10_None()
 
     public function testGetsLinkFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -1855,7 +1855,7 @@ public function testGetsLinkFromRss090_None()
      */
     public function testGetsDateModified($path, $edate)
     {
-        $feed  = Reader\Reader::importString(
+        $feed  = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . $path)
         );
         $entry = $feed->current();
@@ -1906,7 +1906,7 @@ public function dateModifiedProvider()
 
     public function testGetsCommentCountFromRss20_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss20.xml')
         );
         $entry = $feed->current();
@@ -1915,7 +1915,7 @@ public function testGetsCommentCountFromRss20_Slash10()
 
     public function testGetsCommentCountFromRss094_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss094.xml')
         );
         $entry = $feed->current();
@@ -1924,7 +1924,7 @@ public function testGetsCommentCountFromRss094_Slash10()
 
     public function testGetsCommentCountFromRss093_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss093.xml')
         );
         $entry = $feed->current();
@@ -1933,7 +1933,7 @@ public function testGetsCommentCountFromRss093_Slash10()
 
     public function testGetsCommentCountFromRss092_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss092.xml')
         );
         $entry = $feed->current();
@@ -1942,7 +1942,7 @@ public function testGetsCommentCountFromRss092_Slash10()
 
     public function testGetsCommentCountFromRss091_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss091.xml')
         );
         $entry = $feed->current();
@@ -1951,7 +1951,7 @@ public function testGetsCommentCountFromRss091_Slash10()
 
     public function testGetsCommentCountFromRss10_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss10.xml')
         );
         $entry = $feed->current();
@@ -1960,7 +1960,7 @@ public function testGetsCommentCountFromRss10_Slash10()
 
     public function testGetsCommentCountFromRss090_Slash10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/slash10/rss090.xml')
         );
         $entry = $feed->current();
@@ -1971,7 +1971,7 @@ public function testGetsCommentCountFromRss090_Slash10()
 
     public function testGetsCommentCountFromRss20_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss20.xml')
         );
         $entry = $feed->current();
@@ -1980,7 +1980,7 @@ public function testGetsCommentCountFromRss20_Thread10()
 
     public function testGetsCommentCountFromRss094_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss094.xml')
         );
         $entry = $feed->current();
@@ -1989,7 +1989,7 @@ public function testGetsCommentCountFromRss094_Thread10()
 
     public function testGetsCommentCountFromRss093_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss093.xml')
         );
         $entry = $feed->current();
@@ -1998,7 +1998,7 @@ public function testGetsCommentCountFromRss093_Thread10()
 
     public function testGetsCommentCountFromRss092_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2007,7 +2007,7 @@ public function testGetsCommentCountFromRss092_Thread10()
 
     public function testGetsCommentCountFromRss091_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2016,7 +2016,7 @@ public function testGetsCommentCountFromRss091_Thread10()
 
     public function testGetsCommentCountFromRss10_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2025,7 +2025,7 @@ public function testGetsCommentCountFromRss10_Thread10()
 
     public function testGetsCommentCountFromRss090_Thread10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/thread10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2036,7 +2036,7 @@ public function testGetsCommentCountFromRss090_Thread10()
 
     public function testGetsCommentCountFromRss20_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss20.xml')
         );
         $entry = $feed->current();
@@ -2045,7 +2045,7 @@ public function testGetsCommentCountFromRss20_Atom10()
 
     public function testGetsCommentCountFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss094.xml')
         );
         $entry = $feed->current();
@@ -2054,7 +2054,7 @@ public function testGetsCommentCountFromRss094_Atom10()
 
     public function testGetsCommentCountFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss093.xml')
         );
         $entry = $feed->current();
@@ -2063,7 +2063,7 @@ public function testGetsCommentCountFromRss093_Atom10()
 
     public function testGetsCommentCountFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2072,7 +2072,7 @@ public function testGetsCommentCountFromRss092_Atom10()
 
     public function testGetsCommentCountFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2081,7 +2081,7 @@ public function testGetsCommentCountFromRss091_Atom10()
 
     public function testGetsCommentCountFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2090,7 +2090,7 @@ public function testGetsCommentCountFromRss10_Atom10()
 
     public function testGetsCommentCountFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/atom10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2101,7 +2101,7 @@ public function testGetsCommentCountFromRss090_Atom10()
 
     public function testGetsCommentCountFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -2110,7 +2110,7 @@ public function testGetsCommentCountFromRss20_None()
 
     public function testGetsCommentCountFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -2119,7 +2119,7 @@ public function testGetsCommentCountFromRss094_None()
 
     public function testGetsCommentCountFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -2128,7 +2128,7 @@ public function testGetsCommentCountFromRss093_None()
 
     public function testGetsCommentCountFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -2137,7 +2137,7 @@ public function testGetsCommentCountFromRss092_None()
 
     public function testGetsCommentCountFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -2146,7 +2146,7 @@ public function testGetsCommentCountFromRss091_None()
 
     public function testGetsCommentCountFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -2155,7 +2155,7 @@ public function testGetsCommentCountFromRss10_None()
 
     public function testGetsCommentCountFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentcount/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -2168,7 +2168,7 @@ public function testGetsCommentCountFromRss090_None()
 
     public function testGetsCommentLinkFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -2177,7 +2177,7 @@ public function testGetsCommentLinkFromRss20()
 
     public function testGetsCommentLinkFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/rss094.xml')
         );
         $entry = $feed->current();
@@ -2186,7 +2186,7 @@ public function testGetsCommentLinkFromRss094()
 
     public function testGetsCommentLinkFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/rss093.xml')
         );
         $entry = $feed->current();
@@ -2195,7 +2195,7 @@ public function testGetsCommentLinkFromRss093()
 
     public function testGetsCommentLinkFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/rss092.xml')
         );
         $entry = $feed->current();
@@ -2204,7 +2204,7 @@ public function testGetsCommentLinkFromRss092()
 
     public function testGetsCommentLinkFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/rss091.xml')
         );
         $entry = $feed->current();
@@ -2215,7 +2215,7 @@ public function testGetsCommentLinkFromRss091()
 
     public function testGetsCommentLinkFromRss20_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss20.xml')
         );
         $entry = $feed->current();
@@ -2224,7 +2224,7 @@ public function testGetsCommentLinkFromRss20_Atom10()
 
     public function testGetsCommentLinkFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss094.xml')
         );
         $entry = $feed->current();
@@ -2233,7 +2233,7 @@ public function testGetsCommentLinkFromRss094_Atom10()
 
     public function testGetsCommentLinkFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss093.xml')
         );
         $entry = $feed->current();
@@ -2242,7 +2242,7 @@ public function testGetsCommentLinkFromRss093_Atom10()
 
     public function testGetsCommentLinkFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2251,7 +2251,7 @@ public function testGetsCommentLinkFromRss092_Atom10()
 
     public function testGetsCommentLinkFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2260,7 +2260,7 @@ public function testGetsCommentLinkFromRss091_Atom10()
 
     public function testGetsCommentLinkFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2269,7 +2269,7 @@ public function testGetsCommentLinkFromRss10_Atom10()
 
     public function testGetsCommentLinkFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/atom10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2280,7 +2280,7 @@ public function testGetsCommentLinkFromRss090_Atom10()
 
     public function testGetsCommentLinkFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -2289,7 +2289,7 @@ public function testGetsCommentLinkFromRss20_None()
 
     public function testGetsCommentLinkFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -2298,7 +2298,7 @@ public function testGetsCommentLinkFromRss094_None()
 
     public function testGetsCommentLinkFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -2307,7 +2307,7 @@ public function testGetsCommentLinkFromRss093_None()
 
     public function testGetsCommentLinkFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -2316,7 +2316,7 @@ public function testGetsCommentLinkFromRss092_None()
 
     public function testGetsCommentLinkFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -2325,7 +2325,7 @@ public function testGetsCommentLinkFromRss091_None()
 
     public function testGetsCommentLinkFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -2334,7 +2334,7 @@ public function testGetsCommentLinkFromRss10_None()
 
     public function testGetsCommentLinkFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentlink/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -2349,7 +2349,7 @@ public function testGetsCommentLinkFromRss090_None()
 
     public function testGetsCommentFeedLinkFromRss20_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss20.xml')
         );
         $entry = $feed->current();
@@ -2358,7 +2358,7 @@ public function testGetsCommentFeedLinkFromRss20_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss094_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss094.xml')
         );
         $entry = $feed->current();
@@ -2367,7 +2367,7 @@ public function testGetsCommentFeedLinkFromRss094_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss093_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss093.xml')
         );
         $entry = $feed->current();
@@ -2376,7 +2376,7 @@ public function testGetsCommentFeedLinkFromRss093_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss092_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss092.xml')
         );
         $entry = $feed->current();
@@ -2385,7 +2385,7 @@ public function testGetsCommentFeedLinkFromRss092_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss091_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss091.xml')
         );
         $entry = $feed->current();
@@ -2394,7 +2394,7 @@ public function testGetsCommentFeedLinkFromRss091_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss10_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss10.xml')
         );
         $entry = $feed->current();
@@ -2403,7 +2403,7 @@ public function testGetsCommentFeedLinkFromRss10_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss090_WellFormedWeb10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/wellformedweb/rss090.xml')
         );
         $entry = $feed->current();
@@ -2414,7 +2414,7 @@ public function testGetsCommentFeedLinkFromRss090_WellFormedWeb10()
 
     public function testGetsCommentFeedLinkFromRss20_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss20.xml')
         );
         $entry = $feed->current();
@@ -2423,7 +2423,7 @@ public function testGetsCommentFeedLinkFromRss20_Atom10()
 
     public function testGetsCommentFeedLinkFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss094.xml')
         );
         $entry = $feed->current();
@@ -2432,7 +2432,7 @@ public function testGetsCommentFeedLinkFromRss094_Atom10()
 
     public function testGetsCommentFeedLinkFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss093.xml')
         );
         $entry = $feed->current();
@@ -2441,7 +2441,7 @@ public function testGetsCommentFeedLinkFromRss093_Atom10()
 
     public function testGetsCommentFeedLinkFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2450,7 +2450,7 @@ public function testGetsCommentFeedLinkFromRss092_Atom10()
 
     public function testGetsCommentFeedLinkFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2459,7 +2459,7 @@ public function testGetsCommentFeedLinkFromRss091_Atom10()
 
     public function testGetsCommentFeedLinkFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2468,7 +2468,7 @@ public function testGetsCommentFeedLinkFromRss10_Atom10()
 
     public function testGetsCommentFeedLinkFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/atom10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2479,7 +2479,7 @@ public function testGetsCommentFeedLinkFromRss090_Atom10()
 
     public function testGetsCommentFeedLinkFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -2488,7 +2488,7 @@ public function testGetsCommentFeedLinkFromRss20_None()
 
     public function testGetsCommentFeedLinkFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -2497,7 +2497,7 @@ public function testGetsCommentFeedLinkFromRss094_None()
 
     public function testGetsCommentFeedLinkFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -2506,7 +2506,7 @@ public function testGetsCommentFeedLinkFromRss093_None()
 
     public function testGetsCommentFeedLinkFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -2515,7 +2515,7 @@ public function testGetsCommentFeedLinkFromRss092_None()
 
     public function testGetsCommentFeedLinkFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -2524,7 +2524,7 @@ public function testGetsCommentFeedLinkFromRss091_None()
 
     public function testGetsCommentFeedLinkFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss10.xml')
         );
         $entry = $feed->current();
@@ -2533,7 +2533,7 @@ public function testGetsCommentFeedLinkFromRss10_None()
 
     public function testGetsCommentFeedLinkFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/commentfeedlink/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -2548,7 +2548,7 @@ public function testGetsCommentFeedLinkFromRss090_None()
 
     public function testGetsCategoriesFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/rss20.xml')
         );
         $entry = $feed->current();
@@ -2560,7 +2560,7 @@ public function testGetsCategoriesFromRss20()
 
     public function testGetsCategoriesFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2570,7 +2570,7 @@ public function testGetsCategoriesFromRss090_Dc10()
 
     public function testGetsCategoriesFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2580,7 +2580,7 @@ public function testGetsCategoriesFromRss091_Dc10()
 
     public function testGetsCategoriesFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2590,7 +2590,7 @@ public function testGetsCategoriesFromRss092_Dc10()
 
     public function testGetsCategoriesFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss093.xml')
         );
         $entry = $feed->current();
@@ -2600,7 +2600,7 @@ public function testGetsCategoriesFromRss093_Dc10()
 
     public function testGetsCategoriesFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss094.xml')
         );
         $entry = $feed->current();
@@ -2610,7 +2610,7 @@ public function testGetsCategoriesFromRss094_Dc10()
 
     public function testGetsCategoriesFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2622,7 +2622,7 @@ public function testGetsCategoriesFromRss10_Dc10()
 
     public function testGetsCategoriesFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss090.xml')
         );
         $entry = $feed->current();
@@ -2632,7 +2632,7 @@ public function testGetsCategoriesFromRss090_Dc11()
 
     public function testGetsCategoriesFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss091.xml')
         );
         $entry = $feed->current();
@@ -2642,7 +2642,7 @@ public function testGetsCategoriesFromRss091_Dc11()
 
     public function testGetsCategoriesFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss092.xml')
         );
         $entry = $feed->current();
@@ -2652,7 +2652,7 @@ public function testGetsCategoriesFromRss092_Dc11()
 
     public function testGetsCategoriesFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss093.xml')
         );
         $entry = $feed->current();
@@ -2662,7 +2662,7 @@ public function testGetsCategoriesFromRss093_Dc11()
 
     public function testGetsCategoriesFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss094.xml')
         );
         $entry = $feed->current();
@@ -2672,7 +2672,7 @@ public function testGetsCategoriesFromRss094_Dc11()
 
     public function testGetsCategoriesFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss10.xml')
         );
         $entry = $feed->current();
@@ -2684,7 +2684,7 @@ public function testGetsCategoriesFromRss10_Dc11()
 
     public function testGetsCategoriesFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss090.xml')
         );
         $entry = $feed->current();
@@ -2694,7 +2694,7 @@ public function testGetsCategoriesFromRss090_Atom10()
 
     public function testGetsCategoriesFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss091.xml')
         );
         $entry = $feed->current();
@@ -2704,7 +2704,7 @@ public function testGetsCategoriesFromRss091_Atom10()
 
     public function testGetsCategoriesFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss092.xml')
         );
         $entry = $feed->current();
@@ -2714,7 +2714,7 @@ public function testGetsCategoriesFromRss092_Atom10()
 
     public function testGetsCategoriesFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss093.xml')
         );
         $entry = $feed->current();
@@ -2724,7 +2724,7 @@ public function testGetsCategoriesFromRss093_Atom10()
 
     public function testGetsCategoriesFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss094.xml')
         );
         $entry = $feed->current();
@@ -2734,7 +2734,7 @@ public function testGetsCategoriesFromRss094_Atom10()
 
     public function testGetsCategoriesFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss10.xml')
         );
         $entry = $feed->current();
@@ -2746,7 +2746,7 @@ public function testGetsCategoriesFromRss10_Atom10()
 
     public function testGetsCategoriesFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss20.xml')
         );
         $entry = $feed->current();
@@ -2756,7 +2756,7 @@ public function testGetsCategoriesFromRss20_None()
 
     public function testGetsCategoriesFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss090.xml')
         );
         $entry = $feed->current();
@@ -2766,7 +2766,7 @@ public function testGetsCategoriesFromRss090_None()
 
     public function testGetsCategoriesFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss091.xml')
         );
         $entry = $feed->current();
@@ -2776,7 +2776,7 @@ public function testGetsCategoriesFromRss091_None()
 
     public function testGetsCategoriesFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss092.xml')
         );
         $entry = $feed->current();
@@ -2786,7 +2786,7 @@ public function testGetsCategoriesFromRss092_None()
 
     public function testGetsCategoriesFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss093.xml')
         );
         $entry = $feed->current();
@@ -2796,7 +2796,7 @@ public function testGetsCategoriesFromRss093_None()
 
     public function testGetsCategoriesFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss094.xml')
         );
         $entry = $feed->current();
@@ -2806,7 +2806,7 @@ public function testGetsCategoriesFromRss094_None()
 
     public function testGetsCategoriesFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss10.xml')
         );
         $entry = $feed->current();
diff --git a/test/Reader/Feed/AtomSourceTest.php b/test/Reader/Feed/AtomSourceTest.php
index d8820e4a..2ea0bfe5 100644
--- a/test/Reader/Feed/AtomSourceTest.php
+++ b/test/Reader/Feed/AtomSourceTest.php
@@ -62,7 +62,7 @@ public function setup()
 
     public function testGetsSourceFromEntry()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -75,7 +75,7 @@ public function testGetsSourceFromEntry()
 
     public function testGetsTitleFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -88,7 +88,7 @@ public function testGetsTitleFromAtom10()
 
     public function testGetsAuthorArrayFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -111,7 +111,7 @@ public function testGetsAuthorArrayFromAtom10()
 
     public function testGetsSingleAuthorFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -125,7 +125,7 @@ public function testGetsSingleAuthorFromAtom10()
 
     public function testGetsDateCreatedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -140,7 +140,7 @@ public function testGetsDateCreatedFromAtom10()
 
     public function testGetsDateModifiedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -155,7 +155,7 @@ public function testGetsDateModifiedFromAtom10()
 
     public function testGetsGeneratorFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -168,7 +168,7 @@ public function testGetsGeneratorFromAtom10()
 
     public function testGetsCopyrightFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -181,7 +181,7 @@ public function testGetsCopyrightFromAtom10()
 
     public function testGetsDescriptionFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -194,7 +194,7 @@ public function testGetsDescriptionFromAtom10()
 
     public function testGetsIdFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -207,7 +207,7 @@ public function testGetsIdFromAtom10()
 
     public function testGetsLanguageFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -220,7 +220,7 @@ public function testGetsLanguageFromAtom10()
 
     public function testGetsLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -233,7 +233,7 @@ public function testGetsLinkFromAtom10()
 
     public function testGetsFeedLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -245,7 +245,7 @@ public function testGetsFeedLinkFromAtom10()
      */
     public function testGetsHubsFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/atom10.xml')
         );
         $source = $feed->current()->getSource();
@@ -260,7 +260,7 @@ public function testGetsHubsFromAtom10()
      */
     public function testGetsCategoriesFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/atom10.xml')
         );
         $source = $feed->current()->getSource();
diff --git a/test/Reader/Feed/AtomTest.php b/test/Reader/Feed/AtomTest.php
index 80e7a80e..60315fb1 100644
--- a/test/Reader/Feed/AtomTest.php
+++ b/test/Reader/Feed/AtomTest.php
@@ -66,7 +66,7 @@ public function setup()
      */
     public function testGetsTitleFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom03.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -74,7 +74,7 @@ public function testGetsTitleFromAtom03()
 
     public function testGetsTitleFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -85,7 +85,7 @@ public function testGetsTitleFromAtom10()
      */
     public function testGetsAuthorArrayFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom03.xml')
         );
 
@@ -103,7 +103,7 @@ public function testGetsAuthorArrayFromAtom03()
 
     public function testGetsAuthorArrayFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10.xml')
         );
 
@@ -124,7 +124,7 @@ public function testGetsAuthorArrayFromAtom10()
      */
     public function testGetsSingleAuthorFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom03.xml')
         );
 
@@ -133,7 +133,7 @@ public function testGetsSingleAuthorFromAtom03()
 
     public function testGetsSingleAuthorFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10.xml')
         );
 
@@ -145,7 +145,7 @@ public function testGetsSingleAuthorFromAtom10()
      */
     public function testGetsDateCreatedFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/plain/atom03.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -154,7 +154,7 @@ public function testGetsDateCreatedFromAtom03()
 
     public function testGetsDateCreatedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datecreated/plain/atom10.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -166,7 +166,7 @@ public function testGetsDateCreatedFromAtom10()
      */
     public function testGetsDateModifiedFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/plain/atom03.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -175,7 +175,7 @@ public function testGetsDateModifiedFromAtom03()
 
     public function testGetsDateModifiedFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . '/datemodified/plain/atom10.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ATOM, '2009-03-07T08:03:50Z');
@@ -187,7 +187,7 @@ public function testGetsDateModifiedFromAtom10()
      */
     public function testGetsLastBuildDateAlwaysReturnsNullForAtom()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/datemodified/plain/atom10.xml')
         );
         $this->assertNull($feed->getLastBuildDate());
@@ -198,7 +198,7 @@ public function testGetsLastBuildDateAlwaysReturnsNullForAtom()
      */
     public function testGetsGeneratorFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/atom03.xml')
         );
         $this->assertEquals('Zend_Feed', $feed->getGenerator());
@@ -206,7 +206,7 @@ public function testGetsGeneratorFromAtom03()
 
     public function testGetsGeneratorFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/atom10.xml')
         );
         $this->assertEquals('Zend_Feed', $feed->getGenerator());
@@ -217,7 +217,7 @@ public function testGetsGeneratorFromAtom10()
      */
     public function testGetsCopyrightFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/atom03.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -225,7 +225,7 @@ public function testGetsCopyrightFromAtom03()
 
     public function testGetsCopyrightFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/atom10.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -236,7 +236,7 @@ public function testGetsCopyrightFromAtom10()
      */
     public function testGetsDescriptionFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/atom03.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -244,7 +244,7 @@ public function testGetsDescriptionFromAtom03()
 
     public function testGetsDescriptionFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/atom10.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -255,7 +255,7 @@ public function testGetsDescriptionFromAtom10()
      */
     public function testGetsIdFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/atom03.xml')
         );
         $this->assertEquals('123', $feed->getId());
@@ -263,7 +263,7 @@ public function testGetsIdFromAtom03()
 
     public function testGetsIdFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/id/plain/atom10.xml')
         );
         $this->assertEquals('123', $feed->getId());
@@ -274,7 +274,7 @@ public function testGetsIdFromAtom10()
      */
     public function testGetsLanguageFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/atom03.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -282,7 +282,7 @@ public function testGetsLanguageFromAtom03()
 
     public function testGetsLanguageFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/atom10.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -293,7 +293,7 @@ public function testGetsLanguageFromAtom10()
      */
     public function testGetsLinkFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/atom03.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -301,7 +301,7 @@ public function testGetsLinkFromAtom03()
 
     public function testGetsLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/atom10.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -309,7 +309,7 @@ public function testGetsLinkFromAtom10()
 
     public function testGetsLinkFromAtom10WithNoRelAttribute()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/atom10-norel.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -317,7 +317,7 @@ public function testGetsLinkFromAtom10WithNoRelAttribute()
 
     public function testGetsLinkFromAtom10WithRelativeUrl()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/atom10-relative.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -328,7 +328,7 @@ public function testGetsLinkFromAtom10WithRelativeUrl()
      */
     public function testGetsBaseUriFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/atom10-relative.xml')
         );
         $this->assertEquals('http://www.example.com/', $feed->getBaseUrl());
@@ -339,7 +339,7 @@ public function testGetsBaseUriFromAtom10()
      */
     public function testGetsFeedLinkFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/atom03.xml')
         );
         $this->assertEquals('http://www.example.com/feed/atom', $feed->getFeedLink());
@@ -347,7 +347,7 @@ public function testGetsFeedLinkFromAtom03()
 
     public function testGetsFeedLinkFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/atom10.xml')
         );
         $this->assertEquals('http://www.example.com/feed/atom', $feed->getFeedLink());
@@ -355,7 +355,7 @@ public function testGetsFeedLinkFromAtom10()
 
     public function testGetsFeedLinkFromAtom10IfRelativeUri()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/atom10-relative.xml')
         );
         $this->assertEquals('http://www.example.com/feed/atom', $feed->getFeedLink());
@@ -363,7 +363,7 @@ public function testGetsFeedLinkFromAtom10IfRelativeUri()
 
     public function testGetsOriginalSourceUriIfFeedLinkNotAvailableFromFeed()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/atom10_NoFeedLink.xml')
         );
         $feed->setOriginalSourceUri('http://www.example.com/feed/atom');
@@ -375,7 +375,7 @@ public function testGetsOriginalSourceUriIfFeedLinkNotAvailableFromFeed()
      */
     public function testGetsHubsFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom03.xml')
         );
         $this->assertEquals([
@@ -386,7 +386,7 @@ public function testGetsHubsFromAtom03()
 
     public function testGetsHubsFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10.xml')
         );
         $this->assertEquals([
@@ -402,7 +402,7 @@ public function testGetsHubsFromAtom10()
 
     public function testCountableInterface()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/atom10.xml')
         );
         $this->assertEquals(0, count($feed));
@@ -416,7 +416,7 @@ public function testCountableInterface()
 
     public function testGetsCategoriesFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10.xml')
         );
         $this->assertEquals($this->expectedCats, (array) $feed->getCategories());
@@ -425,7 +425,7 @@ public function testGetsCategoriesFromAtom10()
 
     public function testGetsCategoriesFromAtom03_Atom10Extension()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom03.xml')
         );
         $this->assertEquals($this->expectedCats, (array) $feed->getCategories());
@@ -436,7 +436,7 @@ public function testGetsCategoriesFromAtom03_Atom10Extension()
 
     public function testGetsCategoriesFromAtom03_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/atom03.xml')
         );
         $this->assertEquals($this->expectedCatsDc, (array) $feed->getCategories());
@@ -445,7 +445,7 @@ public function testGetsCategoriesFromAtom03_Dc10()
 
     public function testGetsCategoriesFromAtom03_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/atom03.xml')
         );
         $this->assertEquals($this->expectedCatsDc, (array) $feed->getCategories());
@@ -456,7 +456,7 @@ public function testGetsCategoriesFromAtom03_Dc11()
 
     public function testGetsCategoriesFromAtom10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/atom10.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -465,7 +465,7 @@ public function testGetsCategoriesFromAtom10_None()
 
     public function testGetsCategoriesFromAtom03_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/atom03.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -477,7 +477,7 @@ public function testGetsCategoriesFromAtom03_None()
      */
     public function testGetsImageFromAtom03()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/atom03.xml')
         );
         $this->assertEquals(['uri'=>'http://www.example.com/logo.gif'], $feed->getImage());
@@ -485,7 +485,7 @@ public function testGetsImageFromAtom03()
 
     public function testGetsImageFromAtom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/atom10.xml')
         );
         $this->assertEquals(['uri'=>'http://www.example.com/logo.gif'], $feed->getImage());
@@ -496,7 +496,7 @@ public function testGetsImageFromAtom10()
      */
     public function testGetsImageFromAtom03_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/atom03.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -504,7 +504,7 @@ public function testGetsImageFromAtom03_None()
 
     public function testGetsImageFromAtom10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/atom10.xml')
         );
         $this->assertEquals(null, $feed->getImage());
diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
index 11c4d850..f97b8927 100644
--- a/test/Reader/Feed/CommonTest.php
+++ b/test/Reader/Feed/CommonTest.php
@@ -29,7 +29,7 @@ public function setup()
      */
     public function testGetsDomDocumentObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertInstanceOf('DOMDocument', $feed->getDomDocument());
@@ -37,7 +37,7 @@ public function testGetsDomDocumentObject()
 
     public function testGetsDomXpathObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertInstanceOf('DOMXPath', $feed->getXpath());
@@ -45,7 +45,7 @@ public function testGetsDomXpathObject()
 
     public function testGetsXpathPrefixString()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertEquals('/atom:feed', $feed->getXpathPrefix());
@@ -53,7 +53,7 @@ public function testGetsXpathPrefixString()
 
     public function testGetsDomElementObject()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertInstanceOf('DOMElement', $feed->getElement());
@@ -61,7 +61,7 @@ public function testGetsDomElementObject()
 
     public function testSaveXmlOutputsXmlStringForFeed()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $expected = file_get_contents($this->feedSamplePath.'/atom_rewrittenbydom.xml');
@@ -71,7 +71,7 @@ public function testSaveXmlOutputsXmlStringForFeed()
 
     public function testGetsNamedExtension()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertInstanceOf('Zend\Feed\Reader\Extension\Atom\Feed', $feed->getExtension('Atom'));
@@ -79,7 +79,7 @@ public function testGetsNamedExtension()
 
     public function testReturnsNullIfExtensionDoesNotExist()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertEquals(null, $feed->getExtension('Foo'));
@@ -90,7 +90,7 @@ public function testReturnsNullIfExtensionDoesNotExist()
      */
     public function testReturnsEncodingOfFeed()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom.xml')
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
@@ -101,7 +101,7 @@ public function testReturnsEncodingOfFeed()
      */
     public function testReturnsEncodingOfFeedAsUtf8IfUndefined()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/atom_noencodingdefined.xml')
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
diff --git a/test/Reader/Feed/RssTest.php b/test/Reader/Feed/RssTest.php
index 51c2543e..305c785c 100644
--- a/test/Reader/Feed/RssTest.php
+++ b/test/Reader/Feed/RssTest.php
@@ -83,7 +83,7 @@ public function setup()
      */
     public function testGetsTitleFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss20.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -91,7 +91,7 @@ public function testGetsTitleFromRss20()
 
     public function testGetsTitleFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss094.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -99,7 +99,7 @@ public function testGetsTitleFromRss094()
 
     public function testGetsTitleFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss093.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -107,7 +107,7 @@ public function testGetsTitleFromRss093()
 
     public function testGetsTitleFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss092.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -115,7 +115,7 @@ public function testGetsTitleFromRss092()
 
     public function testGetsTitleFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss091.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -123,7 +123,7 @@ public function testGetsTitleFromRss091()
 
     public function testGetsTitleFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss10.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -131,7 +131,7 @@ public function testGetsTitleFromRss10()
 
     public function testGetsTitleFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/rss090.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -141,7 +141,7 @@ public function testGetsTitleFromRss090()
 
     public function testGetsTitleFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss20.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -149,7 +149,7 @@ public function testGetsTitleFromRss20_Dc10()
 
     public function testGetsTitleFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss094.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -157,7 +157,7 @@ public function testGetsTitleFromRss094_Dc10()
 
     public function testGetsTitleFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss093.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -165,7 +165,7 @@ public function testGetsTitleFromRss093_Dc10()
 
     public function testGetsTitleFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss092.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -173,7 +173,7 @@ public function testGetsTitleFromRss092_Dc10()
 
     public function testGetsTitleFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss091.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -181,7 +181,7 @@ public function testGetsTitleFromRss091_Dc10()
 
     public function testGetsTitleFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss10.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -189,7 +189,7 @@ public function testGetsTitleFromRss10_Dc10()
 
     public function testGetsTitleFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc10/rss090.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -199,7 +199,7 @@ public function testGetsTitleFromRss090_Dc10()
 
     public function testGetsTitleFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss20.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -207,7 +207,7 @@ public function testGetsTitleFromRss20_Dc11()
 
     public function testGetsTitleFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss094.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -215,7 +215,7 @@ public function testGetsTitleFromRss094_Dc11()
 
     public function testGetsTitleFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss093.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -223,7 +223,7 @@ public function testGetsTitleFromRss093_Dc11()
 
     public function testGetsTitleFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss092.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -231,7 +231,7 @@ public function testGetsTitleFromRss092_Dc11()
 
     public function testGetsTitleFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss091.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -239,7 +239,7 @@ public function testGetsTitleFromRss091_Dc11()
 
     public function testGetsTitleFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss10.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -247,7 +247,7 @@ public function testGetsTitleFromRss10_Dc11()
 
     public function testGetsTitleFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/dc11/rss090.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -257,7 +257,7 @@ public function testGetsTitleFromRss090_Dc11()
 
     public function testGetsTitleFromRss20_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss20.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -265,7 +265,7 @@ public function testGetsTitleFromRss20_atom10()
 
     public function testGetsTitleFromRss094_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss094.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -273,7 +273,7 @@ public function testGetsTitleFromRss094_atom10()
 
     public function testGetsTitleFromRss093_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss093.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -281,7 +281,7 @@ public function testGetsTitleFromRss093_atom10()
 
     public function testGetsTitleFromRss092_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss092.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -289,7 +289,7 @@ public function testGetsTitleFromRss092_atom10()
 
     public function testGetsTitleFromRss091_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss091.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -297,7 +297,7 @@ public function testGetsTitleFromRss091_atom10()
 
     public function testGetsTitleFromRss10_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss10.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -305,7 +305,7 @@ public function testGetsTitleFromRss10_atom10()
 
     public function testGetsTitleFromRss090_atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/atom10/rss090.xml')
         );
         $this->assertEquals('My Title', $feed->getTitle());
@@ -315,7 +315,7 @@ public function testGetsTitleFromRss090_atom10()
 
     public function testGetsTitleFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -323,7 +323,7 @@ public function testGetsTitleFromRss20_None()
 
     public function testGetsTitleFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -331,7 +331,7 @@ public function testGetsTitleFromRss094_None()
 
     public function testGetsTitleFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -339,7 +339,7 @@ public function testGetsTitleFromRss093_None()
 
     public function testGetsTitleFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -347,7 +347,7 @@ public function testGetsTitleFromRss092_None()
 
     public function testGetsTitleFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -355,7 +355,7 @@ public function testGetsTitleFromRss091_None()
 
     public function testGetsTitleFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -363,7 +363,7 @@ public function testGetsTitleFromRss10_None()
 
     public function testGetsTitleFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/title/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getTitle());
@@ -374,7 +374,7 @@ public function testGetsTitleFromRss090_None()
      */
     public function testGetsAuthorArrayFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss20.xml')
         );
         $this->assertEquals([
@@ -386,7 +386,7 @@ public function testGetsAuthorArrayFromRss20()
 
     public function testGetsAuthorArrayFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss094.xml')
         );
         $this->assertEquals([
@@ -398,7 +398,7 @@ public function testGetsAuthorArrayFromRss094()
 
     public function testGetsAuthorArrayFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss093.xml')
         );
         $this->assertEquals([
@@ -410,7 +410,7 @@ public function testGetsAuthorArrayFromRss093()
 
     public function testGetsAuthorArrayFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss092.xml')
         );
         $this->assertEquals([
@@ -422,7 +422,7 @@ public function testGetsAuthorArrayFromRss092()
 
     public function testGetsAuthorArrayFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss091.xml')
         );
         $this->assertEquals([
@@ -434,7 +434,7 @@ public function testGetsAuthorArrayFromRss091()
 
     public function testGetsAuthorArrayFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss10.xml')
         );
         $this->assertEquals([
@@ -446,7 +446,7 @@ public function testGetsAuthorArrayFromRss10()
 
     public function testGetsAuthorArrayFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss090.xml')
         );
         $this->assertEquals([
@@ -460,7 +460,7 @@ public function testGetsAuthorArrayFromRss090()
 
     public function testGetsAuthorArrayFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss20.xml')
         );
         $this->assertEquals([
@@ -471,7 +471,7 @@ public function testGetsAuthorArrayFromRss20_Dc10()
 
     public function testGetsAuthorArrayFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss094.xml')
         );
         $this->assertEquals([
@@ -482,7 +482,7 @@ public function testGetsAuthorArrayFromRss094_Dc10()
 
     public function testGetsAuthorArrayFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss093.xml')
         );
         $this->assertEquals([
@@ -493,7 +493,7 @@ public function testGetsAuthorArrayFromRss093_Dc10()
 
     public function testGetsAuthorArrayFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss092.xml')
         );
         $this->assertEquals([
@@ -504,7 +504,7 @@ public function testGetsAuthorArrayFromRss092_Dc10()
 
     public function testGetsAuthorArrayFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss091.xml')
         );
         $this->assertEquals([
@@ -515,7 +515,7 @@ public function testGetsAuthorArrayFromRss091_Dc10()
 
     public function testGetsAuthorArrayFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss10.xml')
         );
         $this->assertEquals([
@@ -526,7 +526,7 @@ public function testGetsAuthorArrayFromRss10_Dc10()
 
     public function testGetsAuthorArrayFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss090.xml')
         );
         $this->assertEquals([
@@ -539,7 +539,7 @@ public function testGetsAuthorArrayFromRss090_Dc10()
 
     public function testGetsAuthorArrayFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss20.xml')
         );
         $this->assertEquals([
@@ -550,7 +550,7 @@ public function testGetsAuthorArrayFromRss20_Dc11()
 
     public function testGetsAuthorArrayFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss094.xml')
         );
         $this->assertEquals([
@@ -561,7 +561,7 @@ public function testGetsAuthorArrayFromRss094_Dc11()
 
     public function testGetsAuthorArrayFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss093.xml')
         );
         $this->assertEquals([
@@ -572,7 +572,7 @@ public function testGetsAuthorArrayFromRss093_Dc11()
 
     public function testGetsAuthorArrayFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss092.xml')
         );
         $this->assertEquals([
@@ -583,7 +583,7 @@ public function testGetsAuthorArrayFromRss092_Dc11()
 
     public function testGetsAuthorArrayFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss091.xml')
         );
         $this->assertEquals([
@@ -594,7 +594,7 @@ public function testGetsAuthorArrayFromRss091_Dc11()
 
     public function testGetsAuthorArrayFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss10.xml')
         );
         $this->assertEquals([
@@ -605,7 +605,7 @@ public function testGetsAuthorArrayFromRss10_Dc11()
 
     public function testGetsAuthorArrayFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss090.xml')
         );
         $this->assertEquals([
@@ -618,7 +618,7 @@ public function testGetsAuthorArrayFromRss090_Dc11()
 
     public function testGetsAuthorArrayFromRss20_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss20.xml')
         );
         $this->assertEquals([
@@ -629,7 +629,7 @@ public function testGetsAuthorArrayFromRss20_Atom10()
 
     public function testGetsAuthorArrayFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss094.xml')
         );
         $this->assertEquals([
@@ -640,7 +640,7 @@ public function testGetsAuthorArrayFromRss094_Atom10()
 
     public function testGetsAuthorArrayFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss093.xml')
         );
         $this->assertEquals([
@@ -651,7 +651,7 @@ public function testGetsAuthorArrayFromRss093_Atom10()
 
     public function testGetsAuthorArrayFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss092.xml')
         );
         $this->assertEquals([
@@ -662,7 +662,7 @@ public function testGetsAuthorArrayFromRss092_Atom10()
 
     public function testGetsAuthorArrayFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss091.xml')
         );
         $this->assertEquals([
@@ -673,7 +673,7 @@ public function testGetsAuthorArrayFromRss091_Atom10()
 
     public function testGetsAuthorArrayFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss10.xml')
         );
         $this->assertEquals([
@@ -684,7 +684,7 @@ public function testGetsAuthorArrayFromRss10_Atom10()
 
     public function testGetsAuthorArrayFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/atom10/rss090.xml')
         );
         $this->assertEquals([
@@ -697,7 +697,7 @@ public function testGetsAuthorArrayFromRss090_Atom10()
 
     public function testGetsAuthorArrayFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -705,7 +705,7 @@ public function testGetsAuthorArrayFromRss20_None()
 
     public function testGetsAuthorArrayFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -713,7 +713,7 @@ public function testGetsAuthorArrayFromRss094_None()
 
     public function testGetsAuthorArrayFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -721,7 +721,7 @@ public function testGetsAuthorArrayFromRss093_None()
 
     public function testGetsAuthorArrayFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -729,7 +729,7 @@ public function testGetsAuthorArrayFromRss092_None()
 
     public function testGetsAuthorArrayFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -737,7 +737,7 @@ public function testGetsAuthorArrayFromRss091_None()
 
     public function testGetsAuthorArrayFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -745,7 +745,7 @@ public function testGetsAuthorArrayFromRss10_None()
 
     public function testGetsAuthorArrayFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getAuthors());
@@ -756,7 +756,7 @@ public function testGetsAuthorArrayFromRss090_None()
      */
     public function testGetsSingleAuthorFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss20.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -764,7 +764,7 @@ public function testGetsSingleAuthorFromRss20()
 
     public function testGetsSingleAuthorFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss094.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -772,7 +772,7 @@ public function testGetsSingleAuthorFromRss094()
 
     public function testGetsSingleAuthorFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss093.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -780,7 +780,7 @@ public function testGetsSingleAuthorFromRss093()
 
     public function testGetsSingleAuthorFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss092.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -788,7 +788,7 @@ public function testGetsSingleAuthorFromRss092()
 
     public function testGetsSingleAuthorFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss091.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -796,7 +796,7 @@ public function testGetsSingleAuthorFromRss091()
 
     public function testGetsSingleAuthorFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss10.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -804,7 +804,7 @@ public function testGetsSingleAuthorFromRss10()
 
     public function testGetsSingleAuthorFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/rss090.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs', 'email'=>'joe@example.com'], $feed->getAuthor());
@@ -814,7 +814,7 @@ public function testGetsSingleAuthorFromRss090()
 
     public function testGetsSingleAuthorFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss20.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -822,7 +822,7 @@ public function testGetsSingleAuthorFromRss20_Dc10()
 
     public function testGetsSingleAuthorFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss094.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -830,7 +830,7 @@ public function testGetsSingleAuthorFromRss094_Dc10()
 
     public function testGetsSingleAuthorFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss093.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -838,7 +838,7 @@ public function testGetsSingleAuthorFromRss093_Dc10()
 
     public function testGetsSingleAuthorFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss092.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -846,7 +846,7 @@ public function testGetsSingleAuthorFromRss092_Dc10()
 
     public function testGetsSingleAuthorFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss091.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -854,7 +854,7 @@ public function testGetsSingleAuthorFromRss091_Dc10()
 
     public function testGetsSingleAuthorFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss10.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -862,7 +862,7 @@ public function testGetsSingleAuthorFromRss10_Dc10()
 
     public function testGetsSingleAuthorFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc10/rss090.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -872,7 +872,7 @@ public function testGetsSingleAuthorFromRss090_Dc10()
 
     public function testGetsSingleAuthorFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss20.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -880,7 +880,7 @@ public function testGetsSingleAuthorFromRss20_Dc11()
 
     public function testGetsSingleAuthorFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss094.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -888,7 +888,7 @@ public function testGetsSingleAuthorFromRss094_Dc11()
 
     public function testGetsSingleAuthorFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss093.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -896,7 +896,7 @@ public function testGetsSingleAuthorFromRss093_Dc11()
 
     public function testGetsSingleAuthorFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss092.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -904,7 +904,7 @@ public function testGetsSingleAuthorFromRss092_Dc11()
 
     public function testGetsSingleAuthorFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss091.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -912,7 +912,7 @@ public function testGetsSingleAuthorFromRss091_Dc11()
 
     public function testGetsSingleAuthorFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss10.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -920,7 +920,7 @@ public function testGetsSingleAuthorFromRss10_Dc11()
 
     public function testGetsSingleAuthorFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/dc11/rss090.xml')
         );
         $this->assertEquals(['name'=>'Joe Bloggs'], $feed->getAuthor());
@@ -930,7 +930,7 @@ public function testGetsSingleAuthorFromRss090_Dc11()
 
     public function testGetsSingleAuthorFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -938,7 +938,7 @@ public function testGetsSingleAuthorFromRss20_None()
 
     public function testGetsSingleAuthorFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -946,7 +946,7 @@ public function testGetsSingleAuthorFromRss094_None()
 
     public function testGetsSingleAuthorFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -954,7 +954,7 @@ public function testGetsSingleAuthorFromRss093_None()
 
     public function testGetsSingleAuthorFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -962,7 +962,7 @@ public function testGetsSingleAuthorFromRss092_None()
 
     public function testGetsSingleAuthorFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -970,7 +970,7 @@ public function testGetsSingleAuthorFromRss091_None()
 
     public function testGetsSingleAuthorFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -978,7 +978,7 @@ public function testGetsSingleAuthorFromRss10_None()
 
     public function testGetsSingleAuthorFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/author/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getAuthor());
@@ -989,7 +989,7 @@ public function testGetsSingleAuthorFromRss090_None()
      */
     public function testGetsCopyrightFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss20.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -997,7 +997,7 @@ public function testGetsCopyrightFromRss20()
 
     public function testGetsCopyrightFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss094.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1005,7 +1005,7 @@ public function testGetsCopyrightFromRss094()
 
     public function testGetsCopyrightFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss093.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1013,7 +1013,7 @@ public function testGetsCopyrightFromRss093()
 
     public function testGetsCopyrightFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss092.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1021,7 +1021,7 @@ public function testGetsCopyrightFromRss092()
 
     public function testGetsCopyrightFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss091.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1029,7 +1029,7 @@ public function testGetsCopyrightFromRss091()
 
     public function testGetsCopyrightFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss10.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1037,7 +1037,7 @@ public function testGetsCopyrightFromRss10()
 
     public function testGetsCopyrightFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/rss090.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1047,7 +1047,7 @@ public function testGetsCopyrightFromRss090()
 
     public function testGetsCopyrightFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss20.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1055,7 +1055,7 @@ public function testGetsCopyrightFromRss20_Dc10()
 
     public function testGetsCopyrightFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss094.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1063,7 +1063,7 @@ public function testGetsCopyrightFromRss094_Dc10()
 
     public function testGetsCopyrightFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss093.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1071,7 +1071,7 @@ public function testGetsCopyrightFromRss093_Dc10()
 
     public function testGetsCopyrightFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss092.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1079,7 +1079,7 @@ public function testGetsCopyrightFromRss092_Dc10()
 
     public function testGetsCopyrightFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss091.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1087,7 +1087,7 @@ public function testGetsCopyrightFromRss091_Dc10()
 
     public function testGetsCopyrightFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss10.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1095,7 +1095,7 @@ public function testGetsCopyrightFromRss10_Dc10()
 
     public function testGetsCopyrightFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc10/rss090.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1105,7 +1105,7 @@ public function testGetsCopyrightFromRss090_Dc10()
 
     public function testGetsCopyrightFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss20.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1113,7 +1113,7 @@ public function testGetsCopyrightFromRss20_Dc11()
 
     public function testGetsCopyrightFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss094.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1121,7 +1121,7 @@ public function testGetsCopyrightFromRss094_Dc11()
 
     public function testGetsCopyrightFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss093.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1129,7 +1129,7 @@ public function testGetsCopyrightFromRss093_Dc11()
 
     public function testGetsCopyrightFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss092.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1137,7 +1137,7 @@ public function testGetsCopyrightFromRss092_Dc11()
 
     public function testGetsCopyrightFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss091.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1145,7 +1145,7 @@ public function testGetsCopyrightFromRss091_Dc11()
 
     public function testGetsCopyrightFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss10.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1153,7 +1153,7 @@ public function testGetsCopyrightFromRss10_Dc11()
 
     public function testGetsCopyrightFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/dc11/rss090.xml')
         );
         $this->assertEquals('Copyright 2008', $feed->getCopyright());
@@ -1163,7 +1163,7 @@ public function testGetsCopyrightFromRss090_Dc11()
 
     public function testGetsCopyrightFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1171,7 +1171,7 @@ public function testGetsCopyrightFromRss20_None()
 
     public function testGetsCopyrightFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1179,7 +1179,7 @@ public function testGetsCopyrightFromRss094_None()
 
     public function testGetsCopyrightFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1187,7 +1187,7 @@ public function testGetsCopyrightFromRss093_None()
 
     public function testGetsCopyrightFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1195,7 +1195,7 @@ public function testGetsCopyrightFromRss092_None()
 
     public function testGetsCopyrightFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1203,7 +1203,7 @@ public function testGetsCopyrightFromRss091_None()
 
     public function testGetsCopyrightFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1211,7 +1211,7 @@ public function testGetsCopyrightFromRss10_None()
 
     public function testGetsCopyrightFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/copyright/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -1222,7 +1222,7 @@ public function testGetsCopyrightFromRss090_None()
      */
     public function testGetsDescriptionFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss20.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1230,7 +1230,7 @@ public function testGetsDescriptionFromRss20()
 
     public function testGetsDescriptionFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss094.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1238,7 +1238,7 @@ public function testGetsDescriptionFromRss094()
 
     public function testGetsDescriptionFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss093.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1246,7 +1246,7 @@ public function testGetsDescriptionFromRss093()
 
     public function testGetsDescriptionFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss092.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1254,7 +1254,7 @@ public function testGetsDescriptionFromRss092()
 
     public function testGetsDescriptionFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss091.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1262,7 +1262,7 @@ public function testGetsDescriptionFromRss091()
 
     public function testGetsDescriptionFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss10.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1270,7 +1270,7 @@ public function testGetsDescriptionFromRss10()
 
     public function testGetsDescriptionFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/rss090.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1280,7 +1280,7 @@ public function testGetsDescriptionFromRss090()
 
     public function testGetsDescriptionFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss20.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1288,7 +1288,7 @@ public function testGetsDescriptionFromRss20_Dc10()
 
     public function testGetsDescriptionFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss094.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1296,7 +1296,7 @@ public function testGetsDescriptionFromRss094_Dc10()
 
     public function testGetsDescriptionFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss093.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1304,7 +1304,7 @@ public function testGetsDescriptionFromRss093_Dc10()
 
     public function testGetsDescriptionFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss092.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1312,7 +1312,7 @@ public function testGetsDescriptionFromRss092_Dc10()
 
     public function testGetsDescriptionFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss091.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1320,7 +1320,7 @@ public function testGetsDescriptionFromRss091_Dc10()
 
     public function testGetsDescriptionFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss10.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1328,7 +1328,7 @@ public function testGetsDescriptionFromRss10_Dc10()
 
     public function testGetsDescriptionFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc10/rss090.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1338,7 +1338,7 @@ public function testGetsDescriptionFromRss090_Dc10()
 
     public function testGetsDescriptionFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss20.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1346,7 +1346,7 @@ public function testGetsDescriptionFromRss20_Dc11()
 
     public function testGetsDescriptionFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss094.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1354,7 +1354,7 @@ public function testGetsDescriptionFromRss094_Dc11()
 
     public function testGetsDescriptionFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss093.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1362,7 +1362,7 @@ public function testGetsDescriptionFromRss093_Dc11()
 
     public function testGetsDescriptionFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss092.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1370,7 +1370,7 @@ public function testGetsDescriptionFromRss092_Dc11()
 
     public function testGetsDescriptionFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss091.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1378,7 +1378,7 @@ public function testGetsDescriptionFromRss091_Dc11()
 
     public function testGetsDescriptionFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss10.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1386,7 +1386,7 @@ public function testGetsDescriptionFromRss10_Dc11()
 
     public function testGetsDescriptionFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/dc11/rss090.xml')
         );
         $this->assertEquals('My Description', $feed->getDescription());
@@ -1396,7 +1396,7 @@ public function testGetsDescriptionFromRss090_Dc11()
 
     public function testGetsDescriptionFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1404,7 +1404,7 @@ public function testGetsDescriptionFromRss20_None()
 
     public function testGetsDescriptionFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1412,7 +1412,7 @@ public function testGetsDescriptionFromRss094_None()
 
     public function testGetsDescriptionFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1420,7 +1420,7 @@ public function testGetsDescriptionFromRss093_None()
 
     public function testGetsDescriptionFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1428,7 +1428,7 @@ public function testGetsDescriptionFromRss092_None()
 
     public function testGetsDescriptionFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1436,7 +1436,7 @@ public function testGetsDescriptionFromRss091_None()
 
     public function testGetsDescriptionFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1444,7 +1444,7 @@ public function testGetsDescriptionFromRss10_None()
 
     public function testGetsDescriptionFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/description/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getDescription());
@@ -1455,7 +1455,7 @@ public function testGetsDescriptionFromRss090_None()
      */
     public function testGetsLanguageFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss20.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1463,7 +1463,7 @@ public function testGetsLanguageFromRss20()
 
     public function testGetsLanguageFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss094.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1471,7 +1471,7 @@ public function testGetsLanguageFromRss094()
 
     public function testGetsLanguageFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss093.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1479,7 +1479,7 @@ public function testGetsLanguageFromRss093()
 
     public function testGetsLanguageFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss092.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1487,7 +1487,7 @@ public function testGetsLanguageFromRss092()
 
     public function testGetsLanguageFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss091.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1495,7 +1495,7 @@ public function testGetsLanguageFromRss091()
 
     public function testGetsLanguageFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss10.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1503,7 +1503,7 @@ public function testGetsLanguageFromRss10()
 
     public function testGetsLanguageFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rss090.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1513,7 +1513,7 @@ public function testGetsLanguageFromRss090()
 
     public function testGetsLanguageFromRss20_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss20.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1521,7 +1521,7 @@ public function testGetsLanguageFromRss20_Dc10()
 
     public function testGetsLanguageFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss094.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1529,7 +1529,7 @@ public function testGetsLanguageFromRss094_Dc10()
 
     public function testGetsLanguageFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss093.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1537,7 +1537,7 @@ public function testGetsLanguageFromRss093_Dc10()
 
     public function testGetsLanguageFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss092.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1545,7 +1545,7 @@ public function testGetsLanguageFromRss092_Dc10()
 
     public function testGetsLanguageFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss091.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1553,7 +1553,7 @@ public function testGetsLanguageFromRss091_Dc10()
 
     public function testGetsLanguageFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss10.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1561,7 +1561,7 @@ public function testGetsLanguageFromRss10_Dc10()
 
     public function testGetsLanguageFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc10/rss090.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1571,7 +1571,7 @@ public function testGetsLanguageFromRss090_Dc10()
 
     public function testGetsLanguageFromRss20_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss20.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1579,7 +1579,7 @@ public function testGetsLanguageFromRss20_Dc11()
 
     public function testGetsLanguageFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss094.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1587,7 +1587,7 @@ public function testGetsLanguageFromRss094_Dc11()
 
     public function testGetsLanguageFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss093.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1595,7 +1595,7 @@ public function testGetsLanguageFromRss093_Dc11()
 
     public function testGetsLanguageFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss092.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1603,7 +1603,7 @@ public function testGetsLanguageFromRss092_Dc11()
 
     public function testGetsLanguageFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss091.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1611,7 +1611,7 @@ public function testGetsLanguageFromRss091_Dc11()
 
     public function testGetsLanguageFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss10.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1619,7 +1619,7 @@ public function testGetsLanguageFromRss10_Dc11()
 
     public function testGetsLanguageFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/dc11/rss090.xml')
         );
         $this->assertEquals('en-GB', $feed->getLanguage());
@@ -1629,7 +1629,7 @@ public function testGetsLanguageFromRss090_Dc11()
 
     public function testGetsLanguageFromRss10_XmlLang()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/rdf/rss10.xml')
         );
         $this->assertEquals('en', $feed->getLanguage());
@@ -1639,7 +1639,7 @@ public function testGetsLanguageFromRss10_XmlLang()
 
     public function testGetsLanguageFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1647,7 +1647,7 @@ public function testGetsLanguageFromRss20_None()
 
     public function testGetsLanguageFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1655,7 +1655,7 @@ public function testGetsLanguageFromRss094_None()
 
     public function testGetsLanguageFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1663,7 +1663,7 @@ public function testGetsLanguageFromRss093_None()
 
     public function testGetsLanguageFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1671,7 +1671,7 @@ public function testGetsLanguageFromRss092_None()
 
     public function testGetsLanguageFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1679,7 +1679,7 @@ public function testGetsLanguageFromRss091_None()
 
     public function testGetsLanguageFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1687,7 +1687,7 @@ public function testGetsLanguageFromRss10_None()
 
     public function testGetsLanguageFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/language/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -1698,7 +1698,7 @@ public function testGetsLanguageFromRss090_None()
      */
     public function testGetsLinkFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss20.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1706,7 +1706,7 @@ public function testGetsLinkFromRss20()
 
     public function testGetsLinkFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss094.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1714,7 +1714,7 @@ public function testGetsLinkFromRss094()
 
     public function testGetsLinkFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss093.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1722,7 +1722,7 @@ public function testGetsLinkFromRss093()
 
     public function testGetsLinkFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss092.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1730,7 +1730,7 @@ public function testGetsLinkFromRss092()
 
     public function testGetsLinkFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss091.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1738,7 +1738,7 @@ public function testGetsLinkFromRss091()
 
     public function testGetsLinkFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss10.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1746,7 +1746,7 @@ public function testGetsLinkFromRss10()
 
     public function testGetsLinkFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/rss090.xml')
         );
         $this->assertEquals('http://www.example.com', $feed->getLink());
@@ -1756,7 +1756,7 @@ public function testGetsLinkFromRss090()
 
     public function testGetsLinkFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1764,7 +1764,7 @@ public function testGetsLinkFromRss20_None()
 
     public function testGetsLinkFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1772,7 +1772,7 @@ public function testGetsLinkFromRss094_None()
 
     public function testGetsLinkFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1780,7 +1780,7 @@ public function testGetsLinkFromRss093_None()
 
     public function testGetsLinkFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1788,7 +1788,7 @@ public function testGetsLinkFromRss092_None()
 
     public function testGetsLinkFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1796,7 +1796,7 @@ public function testGetsLinkFromRss091_None()
 
     public function testGetsLinkFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1804,7 +1804,7 @@ public function testGetsLinkFromRss10_None()
 
     public function testGetsLinkFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getLink());
@@ -1816,7 +1816,7 @@ public function testGetsLinkFromRss090_None()
 
     public function testCountableInterface()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/link/plain/none/rss090.xml')
         );
         $this->assertEquals(0, count($feed));
@@ -1827,7 +1827,7 @@ public function testCountableInterface()
      */
     public function testGetsFeedLinkFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss20.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1835,7 +1835,7 @@ public function testGetsFeedLinkFromRss20()
 
     public function testGetsOriginalSourceUriIfFeedLinkNotAvailableFromFeed()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss20_NoFeedLink.xml')
         );
         $feed->setOriginalSourceUri('http://www.example.com/feed/rss');
@@ -1844,7 +1844,7 @@ public function testGetsOriginalSourceUriIfFeedLinkNotAvailableFromFeed()
 
     public function testGetsFeedLinkFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss094.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1852,7 +1852,7 @@ public function testGetsFeedLinkFromRss094()
 
     public function testGetsFeedLinkFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss093.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1860,7 +1860,7 @@ public function testGetsFeedLinkFromRss093()
 
     public function testGetsFeedLinkFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss092.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1868,7 +1868,7 @@ public function testGetsFeedLinkFromRss092()
 
     public function testGetsFeedLinkFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss091.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1876,7 +1876,7 @@ public function testGetsFeedLinkFromRss091()
 
     public function testGetsFeedLinkFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss10.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1884,7 +1884,7 @@ public function testGetsFeedLinkFromRss10()
 
     public function testGetsFeedLinkFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/rss090.xml')
         );
         $this->assertEquals('http://www.example.com/feed/rss', $feed->getFeedLink());
@@ -1894,7 +1894,7 @@ public function testGetsFeedLinkFromRss090()
 
     public function testGetsFeedLinkFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1902,7 +1902,7 @@ public function testGetsFeedLinkFromRss20_None()
 
     public function testGetsFeedLinkFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1910,7 +1910,7 @@ public function testGetsFeedLinkFromRss094_None()
 
     public function testGetsFeedLinkFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1918,7 +1918,7 @@ public function testGetsFeedLinkFromRss093_None()
 
     public function testGetsFeedLinkFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1926,7 +1926,7 @@ public function testGetsFeedLinkFromRss092_None()
 
     public function testGetsFeedLinkFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1934,7 +1934,7 @@ public function testGetsFeedLinkFromRss091_None()
 
     public function testGetsFeedLinkFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1942,7 +1942,7 @@ public function testGetsFeedLinkFromRss10_None()
 
     public function testGetsFeedLinkFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/feedlink/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getFeedLink());
@@ -1953,7 +1953,7 @@ public function testGetsFeedLinkFromRss090_None()
      */
     public function testGetsGeneratorFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss20.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -1961,7 +1961,7 @@ public function testGetsGeneratorFromRss20()
 
     public function testGetsGeneratorFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss094.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -1969,7 +1969,7 @@ public function testGetsGeneratorFromRss094()
 
     public function testGetsGeneratorFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss093.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -1977,7 +1977,7 @@ public function testGetsGeneratorFromRss093()
 
     public function testGetsGeneratorFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss092.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -1985,7 +1985,7 @@ public function testGetsGeneratorFromRss092()
 
     public function testGetsGeneratorFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss091.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -1993,7 +1993,7 @@ public function testGetsGeneratorFromRss091()
 
     public function testGetsGeneratorFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss10.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -2001,7 +2001,7 @@ public function testGetsGeneratorFromRss10()
 
     public function testGetsGeneratorFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/rss090.xml')
         );
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
@@ -2011,7 +2011,7 @@ public function testGetsGeneratorFromRss090()
 
     public function testGetsGeneratorFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2019,7 +2019,7 @@ public function testGetsGeneratorFromRss20_None()
 
     public function testGetsGeneratorFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2027,7 +2027,7 @@ public function testGetsGeneratorFromRss094_None()
 
     public function testGetsGeneratorFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2035,7 +2035,7 @@ public function testGetsGeneratorFromRss093_None()
 
     public function testGetsGeneratorFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2043,7 +2043,7 @@ public function testGetsGeneratorFromRss092_None()
 
     public function testGetsGeneratorFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2051,7 +2051,7 @@ public function testGetsGeneratorFromRss091_None()
 
     public function testGetsGeneratorFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2059,7 +2059,7 @@ public function testGetsGeneratorFromRss10_None()
 
     public function testGetsGeneratorFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/generator/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getGenerator());
@@ -2070,7 +2070,7 @@ public function testGetsGeneratorFromRss090_None()
      */
     public function testGetsLastBuildDateFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/lastbuilddate/plain/rss20.xml')
         );
         $edate = DateTime::createFromFormat(DateTime::ISO8601, '2009-03-07T08:03:50Z');
@@ -2079,7 +2079,7 @@ public function testGetsLastBuildDateFromRss20()
 
     public function testGetsLastBuildDateFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/lastbuilddate/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getLastBuildDate());
@@ -2091,7 +2091,7 @@ public function testGetsLastBuildDateFromRss20_None()
      */
     public function testGetsDateModified($path, $edate)
     {
-        $feed  = Reader\Reader::importString(
+        $feed  = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath . $path)
         );
 
@@ -2143,7 +2143,7 @@ public function dateModifiedProvider()
      */
     public function testGetsHubsFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss20.xml')
         );
         $this->assertEquals([
@@ -2154,7 +2154,7 @@ public function testGetsHubsFromRss20()
 
     public function testGetsHubsFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss094.xml')
         );
         $this->assertEquals([
@@ -2165,7 +2165,7 @@ public function testGetsHubsFromRss094()
 
     public function testGetsHubsFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss093.xml')
         );
         $this->assertEquals([
@@ -2176,7 +2176,7 @@ public function testGetsHubsFromRss093()
 
     public function testGetsHubsFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss092.xml')
         );
         $this->assertEquals([
@@ -2187,7 +2187,7 @@ public function testGetsHubsFromRss092()
 
     public function testGetsHubsFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss091.xml')
         );
         $this->assertEquals([
@@ -2198,7 +2198,7 @@ public function testGetsHubsFromRss091()
 
     public function testGetsHubsFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss10.xml')
         );
         $this->assertEquals([
@@ -2209,7 +2209,7 @@ public function testGetsHubsFromRss10()
 
     public function testGetsHubsFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/atom10/rss090.xml')
         );
         $this->assertEquals([
@@ -2222,7 +2222,7 @@ public function testGetsHubsFromRss090()
 
     public function testGetsHubsFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2230,7 +2230,7 @@ public function testGetsHubsFromRss20_None()
 
     public function testGetsHubsFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2238,7 +2238,7 @@ public function testGetsHubsFromRss094_None()
 
     public function testGetsHubsFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2246,7 +2246,7 @@ public function testGetsHubsFromRss093_None()
 
     public function testGetsHubsFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2254,7 +2254,7 @@ public function testGetsHubsFromRss092_None()
 
     public function testGetsHubsFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2262,7 +2262,7 @@ public function testGetsHubsFromRss091_None()
 
     public function testGetsHubsFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2270,7 +2270,7 @@ public function testGetsHubsFromRss10_None()
 
     public function testGetsHubsFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/hubs/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getHubs());
@@ -2284,7 +2284,7 @@ public function testGetsHubsFromRss090_None()
 
     public function testGetsCategoriesFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/rss20.xml')
         );
         $this->assertEquals($this->expectedCats, (array) $feed->getCategories());
@@ -2295,7 +2295,7 @@ public function testGetsCategoriesFromRss20()
 
     public function testGetsCategoriesFromRss090_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss090.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2304,7 +2304,7 @@ public function testGetsCategoriesFromRss090_Dc10()
 
     public function testGetsCategoriesFromRss091_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss091.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2313,7 +2313,7 @@ public function testGetsCategoriesFromRss091_Dc10()
 
     public function testGetsCategoriesFromRss092_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss092.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2322,7 +2322,7 @@ public function testGetsCategoriesFromRss092_Dc10()
 
     public function testGetsCategoriesFromRss093_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss093.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2331,7 +2331,7 @@ public function testGetsCategoriesFromRss093_Dc10()
 
     public function testGetsCategoriesFromRss094_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss094.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2340,7 +2340,7 @@ public function testGetsCategoriesFromRss094_Dc10()
 
     public function testGetsCategoriesFromRss10_Dc10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc10/rss10.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2351,7 +2351,7 @@ public function testGetsCategoriesFromRss10_Dc10()
 
     public function testGetsCategoriesFromRss090_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss090.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2360,7 +2360,7 @@ public function testGetsCategoriesFromRss090_Dc11()
 
     public function testGetsCategoriesFromRss091_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss091.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2369,7 +2369,7 @@ public function testGetsCategoriesFromRss091_Dc11()
 
     public function testGetsCategoriesFromRss092_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss092.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2378,7 +2378,7 @@ public function testGetsCategoriesFromRss092_Dc11()
 
     public function testGetsCategoriesFromRss093_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss093.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2387,7 +2387,7 @@ public function testGetsCategoriesFromRss093_Dc11()
 
     public function testGetsCategoriesFromRss094_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss094.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2396,7 +2396,7 @@ public function testGetsCategoriesFromRss094_Dc11()
 
     public function testGetsCategoriesFromRss10_Dc11()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/dc11/rss10.xml')
         );
         $this->assertEquals($this->expectedCatsRdf, (array) $feed->getCategories());
@@ -2407,7 +2407,7 @@ public function testGetsCategoriesFromRss10_Dc11()
 
     public function testGetsCategoriesFromRss090_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss090.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2416,7 +2416,7 @@ public function testGetsCategoriesFromRss090_Atom10()
 
     public function testGetsCategoriesFromRss091_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss091.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2425,7 +2425,7 @@ public function testGetsCategoriesFromRss091_Atom10()
 
     public function testGetsCategoriesFromRss092_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss092.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2434,7 +2434,7 @@ public function testGetsCategoriesFromRss092_Atom10()
 
     public function testGetsCategoriesFromRss093_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss093.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2443,7 +2443,7 @@ public function testGetsCategoriesFromRss093_Atom10()
 
     public function testGetsCategoriesFromRss094_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss094.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2452,7 +2452,7 @@ public function testGetsCategoriesFromRss094_Atom10()
 
     public function testGetsCategoriesFromRss10_Atom10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/atom10/rss10.xml')
         );
         $this->assertEquals($this->expectedCatsAtom, (array) $feed->getCategories());
@@ -2463,7 +2463,7 @@ public function testGetsCategoriesFromRss10_Atom10()
 
     public function testGetsCategoriesFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss20.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2472,7 +2472,7 @@ public function testGetsCategoriesFromRss20_None()
 
     public function testGetsCategoriesFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss090.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2481,7 +2481,7 @@ public function testGetsCategoriesFromRss090_None()
 
     public function testGetsCategoriesFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss091.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2490,7 +2490,7 @@ public function testGetsCategoriesFromRss091_None()
 
     public function testGetsCategoriesFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss092.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2499,7 +2499,7 @@ public function testGetsCategoriesFromRss092_None()
 
     public function testGetsCategoriesFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss093.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2508,7 +2508,7 @@ public function testGetsCategoriesFromRss093_None()
 
     public function testGetsCategoriesFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss094.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2517,7 +2517,7 @@ public function testGetsCategoriesFromRss094_None()
 
     public function testGetsCategoriesFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/category/plain/none/rss10.xml')
         );
         $this->assertEquals([], (array) $feed->getCategories());
@@ -2529,7 +2529,7 @@ public function testGetsCategoriesFromRss10_None()
      */
     public function testGetsImageFromRss20()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/rss20.xml')
         );
         $this->assertEquals([
@@ -2544,7 +2544,7 @@ public function testGetsImageFromRss20()
 
     public function testGetsImageFromRss094()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/rss094.xml')
         );
         $this->assertEquals([
@@ -2559,7 +2559,7 @@ public function testGetsImageFromRss094()
 
     public function testGetsImageFromRss093()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/rss093.xml')
         );
         $this->assertEquals([
@@ -2574,7 +2574,7 @@ public function testGetsImageFromRss093()
 
     public function testGetsImageFromRss092()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/rss092.xml')
         );
         $this->assertEquals([
@@ -2589,7 +2589,7 @@ public function testGetsImageFromRss092()
 
     public function testGetsImageFromRss091()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/rss091.xml')
         );
         $this->assertEquals([
@@ -2604,7 +2604,7 @@ public function testGetsImageFromRss091()
 
     /*public function testGetsImageFromRss10()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->_feedSamplePath.'/image/plain/rss10.xml')
         );
         $this->assertEquals(array(
@@ -2619,7 +2619,7 @@ public function testGetsImageFromRss091()
 
     public function testGetsImageFromRss090()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->_feedSamplePath.'/image/plain/rss090.xml')
         );
         $this->assertEquals(array(
@@ -2637,7 +2637,7 @@ public function testGetsImageFromRss090()
      */
     public function testGetsImageFromRss20_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss20.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2645,7 +2645,7 @@ public function testGetsImageFromRss20_None()
 
     public function testGetsImageFromRss094_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss094.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2653,7 +2653,7 @@ public function testGetsImageFromRss094_None()
 
     public function testGetsImageFromRss093_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss093.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2661,7 +2661,7 @@ public function testGetsImageFromRss093_None()
 
     public function testGetsImageFromRss092_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss092.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2669,7 +2669,7 @@ public function testGetsImageFromRss092_None()
 
     public function testGetsImageFromRss091_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss091.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2677,7 +2677,7 @@ public function testGetsImageFromRss091_None()
 
     public function testGetsImageFromRss10_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss10.xml')
         );
         $this->assertEquals(null, $feed->getImage());
@@ -2685,7 +2685,7 @@ public function testGetsImageFromRss10_None()
 
     public function testGetsImageFromRss090_None()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath.'/image/plain/none/rss090.xml')
         );
         $this->assertEquals(null, $feed->getImage());
diff --git a/test/Reader/Integration/HOnlineComAtom10Test.php b/test/Reader/Integration/HOnlineComAtom10Test.php
index 2f7b3e3f..8149645d 100644
--- a/test/Reader/Integration/HOnlineComAtom10Test.php
+++ b/test/Reader/Integration/HOnlineComAtom10Test.php
@@ -26,7 +26,7 @@ public function setup()
 
     public function testGetsTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('The H - news feed', $feed->getTitle());
@@ -34,7 +34,7 @@ public function testGetsTitle()
 
     public function testGetsAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals([['name'=>'The H']], (array) $feed->getAuthors());
@@ -42,7 +42,7 @@ public function testGetsAuthors()
 
     public function testGetsSingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(['name'=>'The H'], $feed->getAuthor());
@@ -50,7 +50,7 @@ public function testGetsSingleAuthor()
 
     public function testGetsCopyright()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -58,7 +58,7 @@ public function testGetsCopyright()
 
     public function testGetsDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Technology news', $feed->getDescription());
@@ -66,7 +66,7 @@ public function testGetsDescription()
 
     public function testGetsLanguage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -74,7 +74,7 @@ public function testGetsLanguage()
 
     public function testGetsLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://www.h-online.com', $feed->getLink());
@@ -82,7 +82,7 @@ public function testGetsLink()
 
     public function testGetsEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
@@ -90,7 +90,7 @@ public function testGetsEncoding()
 
     public function testGetsEntryCount()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(60, $feed->count());
@@ -102,7 +102,7 @@ public function testGetsEntryCount()
 
     public function testGetsEntryId()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -111,7 +111,7 @@ public function testGetsEntryId()
 
     public function testGetsEntryTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -120,7 +120,7 @@ public function testGetsEntryTitle()
 
     public function testGetsEntryAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -129,7 +129,7 @@ public function testGetsEntryAuthors()
 
     public function testGetsEntrySingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -138,7 +138,7 @@ public function testGetsEntrySingleAuthor()
 
     public function testGetsEntryDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -150,7 +150,7 @@ public function testGetsEntryDescription()
 
     public function testGetsEntryContent()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -159,7 +159,7 @@ public function testGetsEntryContent()
 
     public function testGetsEntryLinks()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -168,7 +168,7 @@ public function testGetsEntryLinks()
 
     public function testGetsEntryLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -177,7 +177,7 @@ public function testGetsEntryLink()
 
     public function testGetsEntryPermaLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -187,7 +187,7 @@ public function testGetsEntryPermaLink()
 
     public function testGetsEntryEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
diff --git a/test/Reader/Integration/LautDeRdfTest.php b/test/Reader/Integration/LautDeRdfTest.php
index 482081ee..4100d4f3 100644
--- a/test/Reader/Integration/LautDeRdfTest.php
+++ b/test/Reader/Integration/LautDeRdfTest.php
@@ -30,7 +30,7 @@ public function setup()
 
     public function testGetsTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('laut.de - news', $feed->getTitle());
@@ -38,7 +38,7 @@ public function testGetsTitle()
 
     public function testGetsAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals([['name'=>'laut.de']], (array) $feed->getAuthors());
@@ -46,7 +46,7 @@ public function testGetsAuthors()
 
     public function testGetsSingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(['name'=>'laut.de'], $feed->getAuthor());
@@ -54,7 +54,7 @@ public function testGetsSingleAuthor()
 
     public function testGetsCopyright()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Copyright © 2004 laut.de', $feed->getCopyright());
@@ -62,7 +62,7 @@ public function testGetsCopyright()
 
     public function testGetsDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('laut.de: aktuelle News', $feed->getDescription());
@@ -70,7 +70,7 @@ public function testGetsDescription()
 
     public function testGetsLanguage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(null, $feed->getLanguage());
@@ -78,7 +78,7 @@ public function testGetsLanguage()
 
     public function testGetsLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://www.laut.de', $feed->getLink());
@@ -86,7 +86,7 @@ public function testGetsLink()
 
     public function testGetsEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('ISO-8859-1', $feed->getEncoding());
@@ -100,7 +100,7 @@ public function testGetsEncoding()
 
     public function testGetsEntryId()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -109,7 +109,7 @@ public function testGetsEntryId()
 
     public function testGetsEntryTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -118,7 +118,7 @@ public function testGetsEntryTitle()
 
     public function testGetsEntryAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -127,7 +127,7 @@ public function testGetsEntryAuthors()
 
     public function testGetsEntrySingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -141,7 +141,7 @@ public function testGetsEntrySingleAuthor()
 
     public function testGetsEntryDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -150,7 +150,7 @@ public function testGetsEntryDescription()
 
     public function testGetsEntryContent()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -159,7 +159,7 @@ public function testGetsEntryContent()
 
     public function testGetsEntryLinks()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -168,7 +168,7 @@ public function testGetsEntryLinks()
 
     public function testGetsEntryLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -177,7 +177,7 @@ public function testGetsEntryLink()
 
     public function testGetsEntryPermaLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -187,7 +187,7 @@ public function testGetsEntryPermaLink()
 
     public function testGetsEntryEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
diff --git a/test/Reader/Integration/PodcastRss2Test.php b/test/Reader/Integration/PodcastRss2Test.php
index 481d2d8a..cecd247a 100644
--- a/test/Reader/Integration/PodcastRss2Test.php
+++ b/test/Reader/Integration/PodcastRss2Test.php
@@ -30,7 +30,7 @@ public function setup()
 
     public function testGetsNewFeedUrl()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://newlocation.com/example.rss', $feed->getNewFeedUrl());
@@ -38,7 +38,7 @@ public function testGetsNewFeedUrl()
 
     public function testGetsOwner()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('john.doe@example.com (John Doe)', $feed->getOwner());
@@ -46,7 +46,7 @@ public function testGetsOwner()
 
     public function testGetsCategories()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals([
@@ -59,7 +59,7 @@ public function testGetsCategories()
 
     public function testGetsTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('All About Everything', $feed->getTitle());
@@ -67,7 +67,7 @@ public function testGetsTitle()
 
     public function testGetsCastAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('John Doe', $feed->getCastAuthor());
@@ -75,7 +75,7 @@ public function testGetsCastAuthor()
 
     public function testGetsFeedBlock()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('no', $feed->getBlock());
@@ -83,7 +83,7 @@ public function testGetsFeedBlock()
 
     public function testGetsCopyright()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('℗ & © 2005 John Doe & Family', $feed->getCopyright());
@@ -91,7 +91,7 @@ public function testGetsCopyright()
 
     public function testGetsDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $expected = 'All About Everything is a show about everything.
@@ -104,7 +104,7 @@ public function testGetsDescription()
 
     public function testGetsLanguage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('en-us', $feed->getLanguage());
@@ -112,7 +112,7 @@ public function testGetsLanguage()
 
     public function testGetsLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://www.example.com/podcasts/everything/index.html', $feed->getLink());
@@ -120,7 +120,7 @@ public function testGetsLink()
 
     public function testGetsEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
@@ -128,7 +128,7 @@ public function testGetsEncoding()
 
     public function testGetsFeedExplicit()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('yes', $feed->getExplicit());
@@ -136,7 +136,7 @@ public function testGetsFeedExplicit()
 
     public function testGetsEntryCount()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(3, $feed->count());
@@ -144,7 +144,7 @@ public function testGetsEntryCount()
 
     public function testGetsImage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://example.com/podcasts/everything/AllAboutEverything.jpg', $feed->getItunesImage());
@@ -156,7 +156,7 @@ public function testGetsImage()
 
     public function testGetsEntryBlock()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -165,7 +165,7 @@ public function testGetsEntryBlock()
 
     public function testGetsEntryId()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -174,7 +174,7 @@ public function testGetsEntryId()
 
     public function testGetsEntryTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -183,7 +183,7 @@ public function testGetsEntryTitle()
 
     public function testGetsEntryCastAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -192,7 +192,7 @@ public function testGetsEntryCastAuthor()
 
     public function testGetsEntryExplicit()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -201,7 +201,7 @@ public function testGetsEntryExplicit()
 
     public function testGetsSubtitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -213,7 +213,7 @@ public function testGetsSubtitle()
 
     public function testGetsSummary()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -227,7 +227,7 @@ public function testGetsSummary()
 
     public function testGetsDuration()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -236,7 +236,7 @@ public function testGetsDuration()
 
     public function testGetsKeywords()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -248,7 +248,7 @@ public function testGetsKeywords()
 
     public function testGetsEntryEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -257,7 +257,7 @@ public function testGetsEntryEncoding()
 
     public function testGetsEnclosure()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
diff --git a/test/Reader/Integration/WordpressAtom10Test.php b/test/Reader/Integration/WordpressAtom10Test.php
index 3b0f6818..5055ce8f 100644
--- a/test/Reader/Integration/WordpressAtom10Test.php
+++ b/test/Reader/Integration/WordpressAtom10Test.php
@@ -26,7 +26,7 @@ public function setup()
 
     public function testGetsTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Norm 2782', $feed->getTitle());
@@ -34,7 +34,7 @@ public function testGetsTitle()
 
     public function testGetsAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals([
@@ -44,7 +44,7 @@ public function testGetsAuthors()
 
     public function testGetsSingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(['name'=>'norm2782', 'uri'=>'http://www.norm2782.com'], $feed->getAuthor());
@@ -52,7 +52,7 @@ public function testGetsSingleAuthor()
 
     public function testGetsCopyright()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -60,7 +60,7 @@ public function testGetsCopyright()
 
     public function testGetsDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Why are you here?', $feed->getDescription());
@@ -68,7 +68,7 @@ public function testGetsDescription()
 
     public function testGetsLanguage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('en', $feed->getLanguage());
@@ -76,7 +76,7 @@ public function testGetsLanguage()
 
     public function testGetsLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://www.norm2782.com', $feed->getLink());
@@ -84,7 +84,7 @@ public function testGetsLink()
 
     public function testGetsEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
@@ -92,7 +92,7 @@ public function testGetsEncoding()
 
     public function testGetsEntryCount()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(10, $feed->count());
@@ -104,7 +104,7 @@ public function testGetsEntryCount()
 
     public function testGetsEntryId()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -113,7 +113,7 @@ public function testGetsEntryId()
 
     public function testGetsEntryTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -126,7 +126,7 @@ public function testGetsEntryTitle()
 
     public function testGetsEntryAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -135,7 +135,7 @@ public function testGetsEntryAuthors()
 
     public function testGetsEntrySingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -144,7 +144,7 @@ public function testGetsEntrySingleAuthor()
 
     public function testGetsEntryDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -156,7 +156,7 @@ public function testGetsEntryDescription()
 
     public function testGetsEntryContent()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -165,7 +165,7 @@ public function testGetsEntryContent()
 
     public function testGetsEntryLinks()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -174,7 +174,7 @@ public function testGetsEntryLinks()
 
     public function testGetsEntryLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -183,7 +183,7 @@ public function testGetsEntryLink()
 
     public function testGetsEntryPermaLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -193,7 +193,7 @@ public function testGetsEntryPermaLink()
 
     public function testGetsEntryEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
diff --git a/test/Reader/Integration/WordpressRss2DcAtomTest.php b/test/Reader/Integration/WordpressRss2DcAtomTest.php
index dbe79562..814edf9b 100644
--- a/test/Reader/Integration/WordpressRss2DcAtomTest.php
+++ b/test/Reader/Integration/WordpressRss2DcAtomTest.php
@@ -30,7 +30,7 @@ public function setup()
 
     public function testGetsTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Norm 2782', $feed->getTitle());
@@ -38,7 +38,7 @@ public function testGetsTitle()
 
     public function testGetsAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals([
@@ -48,7 +48,7 @@ public function testGetsAuthors()
 
     public function testGetsSingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(['name'=>'norm2782'], $feed->getAuthor());
@@ -56,7 +56,7 @@ public function testGetsSingleAuthor()
 
     public function testGetsCopyright()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(null, $feed->getCopyright());
@@ -64,7 +64,7 @@ public function testGetsCopyright()
 
     public function testGetsDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('Why are you here?', $feed->getDescription());
@@ -72,7 +72,7 @@ public function testGetsDescription()
 
     public function testGetsLanguage()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('en', $feed->getLanguage());
@@ -80,7 +80,7 @@ public function testGetsLanguage()
 
     public function testGetsLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('http://www.norm2782.com', $feed->getLink());
@@ -88,7 +88,7 @@ public function testGetsLink()
 
     public function testGetsEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals('UTF-8', $feed->getEncoding());
@@ -96,7 +96,7 @@ public function testGetsEncoding()
 
     public function testGetsEntryCount()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $this->assertEquals(10, $feed->count());
@@ -108,7 +108,7 @@ public function testGetsEntryCount()
 
     public function testGetsEntryId()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -117,7 +117,7 @@ public function testGetsEntryId()
 
     public function testGetsEntryTitle()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -130,7 +130,7 @@ public function testGetsEntryTitle()
 
     public function testGetsEntryAuthors()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -139,7 +139,7 @@ public function testGetsEntryAuthors()
 
     public function testGetsEntrySingleAuthor()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -148,7 +148,7 @@ public function testGetsEntrySingleAuthor()
 
     public function testGetsEntryDescription()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -160,7 +160,7 @@ public function testGetsEntryDescription()
 
     public function testGetsEntryContent()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -169,7 +169,7 @@ public function testGetsEntryContent()
 
     public function testGetsEntryLinks()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -178,7 +178,7 @@ public function testGetsEntryLinks()
 
     public function testGetsEntryLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -187,7 +187,7 @@ public function testGetsEntryLink()
 
     public function testGetsEntryPermaLink()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();
@@ -197,7 +197,7 @@ public function testGetsEntryPermaLink()
 
     public function testGetsEntryEncoding()
     {
-        $feed = Reader\Reader::importString(
+        $feed = (new Reader\Reader())->importString(
             file_get_contents($this->feedSamplePath)
         );
         $entry = $feed->current();

From 623cea17c58988493499866e9e3777e39fdd4c8b Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 08:04:58 +0200
Subject: [PATCH 05/15] fix tests static method calls

---
 test/PubSubHubbub/PubSubHubbubTest.php  |  2 +-
 test/Writer/Renderer/Entry/AtomTest.php | 36 ++++++++---------
 test/Writer/Renderer/Entry/RssTest.php  | 42 ++++++++++----------
 test/Writer/Renderer/Feed/AtomTest.php  | 50 ++++++++++++------------
 test/Writer/Renderer/Feed/RssTest.php   | 52 ++++++++++++-------------
 5 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/test/PubSubHubbub/PubSubHubbubTest.php b/test/PubSubHubbub/PubSubHubbubTest.php
index ca55b480..52cfaa30 100644
--- a/test/PubSubHubbub/PubSubHubbubTest.php
+++ b/test/PubSubHubbub/PubSubHubbubTest.php
@@ -20,7 +20,7 @@ class PubSubHubbubTest extends \PHPUnit_Framework_TestCase
 {
     public function testCanDetectHubs()
     {
-        $feed = FeedReader::importFile(__DIR__ . '/_files/rss20.xml');
+        $feed = (new FeedReader())->importFile(__DIR__ . '/_files/rss20.xml');
         $this->assertEquals([
             'http://www.example.com/hub', 'http://www.example.com/hub2'
         ], PubSubHubbub::detectHubs($feed));
diff --git a/test/Writer/Renderer/Entry/AtomTest.php b/test/Writer/Renderer/Entry/AtomTest.php
index 16626d25..d9920d2f 100644
--- a/test/Writer/Renderer/Entry/AtomTest.php
+++ b/test/Writer/Renderer/Entry/AtomTest.php
@@ -65,7 +65,7 @@ public function testEntryEncodingHasBeenSet()
     {
         $this->validWriter->setEncoding('iso-8859-1');
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('iso-8859-1', $entry->getEncoding());
     }
@@ -73,7 +73,7 @@ public function testEntryEncodingHasBeenSet()
     public function testEntryEncodingDefaultIsUsedIfEncodingNotSetByHand()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('UTF-8', $entry->getEncoding());
     }
@@ -81,7 +81,7 @@ public function testEntryEncodingDefaultIsUsedIfEncodingNotSetByHand()
     public function testEntryTitleHasBeenSet()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('This is a test entry.', $entry->getTitle());
     }
@@ -99,7 +99,7 @@ public function testFeedTitleIfMissingThrowsException()
     public function testEntrySummaryDescriptionHasBeenSet()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('This is a test entry description.', $entry->getDescription());
     }
@@ -110,7 +110,7 @@ public function testEntrySummaryDescriptionHasBeenSet()
     public function testEntryContentHasBeenSet_Xhtml()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('<p class="xhtml:">This is test content for <em>xhtml:</em></p>', $entry->getContent());
     }
@@ -129,7 +129,7 @@ public function testFeedContentIfMissingThrowsExceptionIfThereIsNoLink()
     public function testEntryUpdatedDateHasBeenSet()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals(1234567890, $entry->getDateModified()->getTimestamp());
     }
@@ -147,7 +147,7 @@ public function testFeedUpdatedDateIfMissingThrowsException()
     public function testEntryPublishedDateHasBeenSet()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals(1234567000, $entry->getDateCreated()->getTimestamp());
     }
@@ -155,7 +155,7 @@ public function testEntryPublishedDateHasBeenSet()
     public function testEntryIncludesLinkToHtmlVersionOfFeed()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('http://www.example.com/1', $entry->getLink());
     }
@@ -163,7 +163,7 @@ public function testEntryIncludesLinkToHtmlVersionOfFeed()
     public function testEntryHoldsAnyAuthorAdded()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $author   = $entry->getAuthor();
         $this->assertEquals([
@@ -180,7 +180,7 @@ public function testEntryHoldsAnyEnclosureAdded()
                                               'length' => '1337',
                                               'uri'    => 'http://example.com/audio.mp3'
                                          ]);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $enc   = $entry->getEnclosure();
         $this->assertEquals('audio/mpeg', $enc->type);
@@ -192,7 +192,7 @@ public function testEntryIdHasBeenSet()
     {
         $this->validEntry->setId('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6');
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6', $entry->getId());
     }
@@ -201,7 +201,7 @@ public function testEntryIdHasBeenSetUsingSimpleTagUri()
     {
         $this->validEntry->setId('tag:example.org,2010:/foo/bar/');
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('tag:example.org,2010:/foo/bar/', $entry->getId());
     }
@@ -210,7 +210,7 @@ public function testEntryIdHasBeenSetUsingComplexTagUri()
     {
         $this->validEntry->setId('tag:diveintomark.org,2004-05-27:/archives/2004/05/27/howto-atom-linkblog');
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('tag:diveintomark.org,2004-05-27:/archives/2004/05/27/howto-atom-linkblog',
                             $entry->getId());
@@ -219,7 +219,7 @@ public function testEntryIdHasBeenSetUsingComplexTagUri()
     public function testFeedIdDefaultIsUsedIfNotSetByHand()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals($entry->getLink(), $entry->getId());
     }
@@ -252,7 +252,7 @@ public function testCommentLinkRendered()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
         $this->validEntry->setCommentLink('http://www.example.com/id/1');
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals('http://www.example.com/id/1', $entry->getCommentLink());
     }
@@ -261,7 +261,7 @@ public function testCommentCountRendered()
     {
         $renderer = new Renderer\Feed\Atom($this->validWriter);
         $this->validEntry->setCommentCount(22);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals(22, $entry->getCommentCount());
     }
@@ -276,7 +276,7 @@ public function testCategoriesCanBeSet()
                                           ]);
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed     = Reader\Reader::importString($atomFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($atomFeed->saveXml());
         $entry    = $feed->current();
         $expected = [
             ['term'   => 'cat_dog',
@@ -298,7 +298,7 @@ public function testCommentFeedLinksRendered()
                                                      ['uri' => 'http://www.example.com/rss/id/1',
                                                            'type'=> 'rss'],
                                                 ]);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         // Skipped over due to ZFR bug (detects Atom in error when RSS requested)
         //$this->assertEquals('http://www.example.com/rss/id/1', $entry->getCommentFeedLink('rss'));
diff --git a/test/Writer/Renderer/Entry/RssTest.php b/test/Writer/Renderer/Entry/RssTest.php
index 72d9c0e7..1cedca34 100644
--- a/test/Writer/Renderer/Entry/RssTest.php
+++ b/test/Writer/Renderer/Entry/RssTest.php
@@ -54,7 +54,7 @@ public function testEntryEncodingHasBeenSet()
     {
         $this->validWriter->setEncoding('iso-8859-1');
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('iso-8859-1', $entry->getEncoding());
     }
@@ -62,7 +62,7 @@ public function testEntryEncodingHasBeenSet()
     public function testEntryEncodingDefaultIsUsedIfEncodingNotSetByHand()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('UTF-8', $entry->getEncoding());
     }
@@ -70,7 +70,7 @@ public function testEntryEncodingDefaultIsUsedIfEncodingNotSetByHand()
     public function testEntryTitleHasBeenSet()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('This is a test entry.', $entry->getTitle());
     }
@@ -90,7 +90,7 @@ public function testEntryTitleCharDataEncoding()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
         $this->validEntry->setTitle('<>&\'"áéíóú');
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals('<>&\'"áéíóú', $entry->getTitle());
     }
@@ -98,7 +98,7 @@ public function testEntryTitleCharDataEncoding()
     public function testEntrySummaryDescriptionHasBeenSet()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('This is a test entry description.', $entry->getDescription());
     }
@@ -118,7 +118,7 @@ public function testEntryDescriptionCharDataEncoding()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
         $this->validEntry->setDescription('<>&\'"áéíóú');
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals('<>&\'"áéíóú', $entry->getDescription());
     }
@@ -127,7 +127,7 @@ public function testEntryContentHasBeenSet()
     {
         $this->validEntry->setContent('This is test entry content.');
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('This is test entry content.', $entry->getContent());
     }
@@ -136,7 +136,7 @@ public function testEntryContentCharDataEncoding()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
         $this->validEntry->setContent('<>&\'"áéíóú');
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals('<>&\'"áéíóú', $entry->getContent());
     }
@@ -145,7 +145,7 @@ public function testEntryUpdatedDateHasBeenSet()
     {
         $this->validEntry->setDateModified(1234567890);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals(1234567890, $entry->getDateModified()->getTimestamp());
     }
@@ -154,7 +154,7 @@ public function testEntryPublishedDateHasBeenSet()
     {
         $this->validEntry->setDateCreated(1234567000);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals(1234567000, $entry->getDateCreated()->getTimestamp());
     }
@@ -162,7 +162,7 @@ public function testEntryPublishedDateHasBeenSet()
     public function testEntryIncludesLinkToHtmlVersionOfFeed()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('http://www.example.com/1', $entry->getLink());
     }
@@ -173,7 +173,7 @@ public function testEntryHoldsAnyAuthorAdded()
                                             'email'=> 'jane@example.com',
                                             'uri'  => 'http://www.example.com/jane']);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $author   = $entry->getAuthor();
         $this->assertEquals(['name'=> 'Jane'], $entry->getAuthor());
@@ -185,7 +185,7 @@ public function testEntryAuthorCharDataEncoding()
                                             'email'=> 'jane@example.com',
                                             'uri'  => 'http://www.example.com/jane']);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $author   = $entry->getAuthor();
         $this->assertEquals(['name'=> '<>&\'"áéíóú'], $entry->getAuthor());
@@ -199,7 +199,7 @@ public function testEntryHoldsAnyEnclosureAdded()
                                               'length' => '1337',
                                               'uri'    => 'http://example.com/audio.mp3'
                                          ]);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $enc   = $entry->getEnclosure();
         $this->assertEquals('audio/mpeg', $enc->type);
@@ -298,7 +298,7 @@ public function testEntryIdHasBeenSet()
     {
         $this->validEntry->setId('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6');
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6', $entry->getId());
     }
@@ -311,7 +311,7 @@ public function testEntryIdHasBeenSetWithPermaLinkAsFalseWhenNotUri()
     public function testEntryIdDefaultIsUsedIfNotSetByHand()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $this->assertEquals($entry->getLink(), $entry->getId());
     }
@@ -320,7 +320,7 @@ public function testCommentLinkRendered()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
         $this->validEntry->setCommentLink('http://www.example.com/id/1');
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals('http://www.example.com/id/1', $entry->getCommentLink());
     }
@@ -329,7 +329,7 @@ public function testCommentCountRendered()
     {
         $renderer = new Renderer\Feed\Rss($this->validWriter);
         $this->validEntry->setCommentCount(22);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         $this->assertEquals(22, $entry->getCommentCount());
     }
@@ -343,7 +343,7 @@ public function testCommentFeedLinksRendered()
                                                      ['uri' => 'http://www.example.com/rss/id/1',
                                                            'type'=> 'rss'],
                                                 ]);
-        $feed  = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed  = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry = $feed->current();
         // Skipped assertion is because RSS has no facility to show Atom feeds without an extension
         $this->assertEquals('http://www.example.com/rss/id/1', $entry->getCommentFeedLink('rss'));
@@ -359,7 +359,7 @@ public function testCategoriesCanBeSet()
                                                ['term'=> 'cat_dog2']
                                           ]);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $expected = [
             ['term'   => 'cat_dog',
@@ -384,7 +384,7 @@ public function testCategoriesCharDataEncoding()
                                                ['term'=> 'cat_dog2']
                                           ]);
         $renderer = new Renderer\Feed\Rss($this->validWriter);
-        $feed     = Reader\Reader::importString($renderer->render()->saveXml());
+        $feed     = (new Reader\Reader())->importString($renderer->render()->saveXml());
         $entry    = $feed->current();
         $expected = [
             ['term'   => '<>&\'"áéíóú',
diff --git a/test/Writer/Renderer/Feed/AtomTest.php b/test/Writer/Renderer/Feed/AtomTest.php
index 3c009904..e465064a 100644
--- a/test/Writer/Renderer/Feed/AtomTest.php
+++ b/test/Writer/Renderer/Feed/AtomTest.php
@@ -59,7 +59,7 @@ public function testFeedEncodingHasBeenSet()
         $this->validWriter->setEncoding('iso-8859-1');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('iso-8859-1', $feed->getEncoding());
     }
 
@@ -82,7 +82,7 @@ public function testFeedEncodingDefaultIsUsedIfEncodingNotSetByHand()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('UTF-8', $feed->getEncoding());
     }
 
@@ -90,7 +90,7 @@ public function testFeedTitleHasBeenSet()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('This is a test feed.', $feed->getTitle());
     }
 
@@ -112,7 +112,7 @@ public function testFeedTitleCharDataEncoding()
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $this->validWriter->setTitle('<>&\'"áéíóú');
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getTitle());
     }
 
@@ -120,7 +120,7 @@ public function testFeedSubtitleHasBeenSet()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('This is a test description.', $feed->getDescription());
     }
 
@@ -139,7 +139,7 @@ public function testFeedSubtitleCharDataEncoding()
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $this->validWriter->setDescription('<>&\'"áéíóú');
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getDescription());
     }
 
@@ -147,7 +147,7 @@ public function testFeedUpdatedDateHasBeenSet()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals(1234567890, $feed->getDateModified()->getTimestamp());
     }
 
@@ -166,7 +166,7 @@ public function testFeedGeneratorHasBeenSet()
         $this->validWriter->setGenerator('FooFeedBuilder', '1.00', 'http://www.example.com');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('FooFeedBuilder', $feed->getGenerator());
     }
 
@@ -181,7 +181,7 @@ public function testFeedGeneratorDefaultIsUsedIfGeneratorNotSetByHand()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('Zend_Feed_Writer', $feed->getGenerator());
     }
 
@@ -193,7 +193,7 @@ public function testFeedGeneratorCharDataEncoding()
         $this->validWriter->setGenerator('<>&\'"áéíóú', '1.00', 'http://www.example.com');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getGenerator());
     }
 
@@ -202,7 +202,7 @@ public function testFeedLanguageHasBeenSet()
         $this->validWriter->setLanguage('fr');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('fr', $feed->getLanguage());
     }
 
@@ -217,7 +217,7 @@ public function testFeedLanguageDefaultIsUsedIfGeneratorNotSetByHand()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals(null, $feed->getLanguage());
     }
 
@@ -225,7 +225,7 @@ public function testFeedIncludesLinkToHtmlVersionOfFeed()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('http://www.example.com', $feed->getLink());
     }
 
@@ -251,7 +251,7 @@ public function testFeedIncludesLinkToXmlAtomWhereTheFeedWillBeAvailable()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('http://www.example.com/atom', $feed->getFeedLink());
     }
 
@@ -269,7 +269,7 @@ public function testFeedHoldsAnyAuthorAdded()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed   = Reader\Reader::importString($atomFeed->saveXml());
+        $feed   = (new Reader\Reader())->importString($atomFeed->saveXml());
         $author = $feed->getAuthor();
         $this->assertEquals([
                                  'email'=> 'joe@example.com',
@@ -289,7 +289,7 @@ public function testFeedAuthorCharDataEncoding()
                                             'name' => '<>&\'"áéíóú',
                                             'uri'  => 'http://www.example.com/joe']);
         $atomFeed->render();
-        $feed   = Reader\Reader::importString($atomFeed->saveXml());
+        $feed   = (new Reader\Reader())->importString($atomFeed->saveXml());
         $author = $feed->getAuthor();
         $this->assertEquals([
                                  'email'=> '<>&\'"áéíóú',
@@ -312,7 +312,7 @@ public function testFeedIdHasBeenSet()
         $this->validWriter->setId('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6', $feed->getId());
     }
 
@@ -320,7 +320,7 @@ public function testFeedIdDefaultOfHtmlLinkIsUsedIfNotSetByHand()
     {
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals($feed->getLink(), $feed->getId());
     }
 
@@ -329,7 +329,7 @@ public function testBaseUrlCanBeSet()
         $this->validWriter->setBaseUrl('http://www.example.com/base');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('http://www.example.com/base', $feed->getBaseUrl());
     }
 
@@ -338,7 +338,7 @@ public function testCopyrightCanBeSet()
         $this->validWriter->setCopyright('Copyright © 2009 Paddy');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('Copyright © 2009 Paddy', $feed->getCopyright());
     }
 
@@ -347,7 +347,7 @@ public function testCopyrightCharDataEncoding()
         $this->validWriter->setCopyright('<>&\'"áéíóú');
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed = Reader\Reader::importString($atomFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($atomFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getCopyright());
     }
 
@@ -361,7 +361,7 @@ public function testCategoriesCanBeSet()
                                            ]);
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed     = Reader\Reader::importString($atomFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($atomFeed->saveXml());
         $expected = [
             ['term'   => 'cat_dog',
                   'label'  => 'Cats & Dogs',
@@ -383,7 +383,7 @@ public function testCategoriesCharDataEncoding()
                                            ]);
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed     = Reader\Reader::importString($atomFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($atomFeed->saveXml());
         $expected = [
             ['term'   => 'cat_dog',
                   'label'  => '<>&\'"áéíóú',
@@ -402,7 +402,7 @@ public function testHubsCanBeSet()
         );
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed     = Reader\Reader::importString($atomFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($atomFeed->saveXml());
         $expected = [
             'http://www.example.com/hub', 'http://www.example.com/hub2'
         ];
@@ -416,7 +416,7 @@ public function testImageCanBeSet()
         );
         $atomFeed = new Renderer\Feed\Atom($this->validWriter);
         $atomFeed->render();
-        $feed     = Reader\Reader::importString($atomFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($atomFeed->saveXml());
         $expected = [
             'uri' => 'http://www.example.com/logo.gif'
         ];
diff --git a/test/Writer/Renderer/Feed/RssTest.php b/test/Writer/Renderer/Feed/RssTest.php
index 1c6d18c8..742d4cd8 100644
--- a/test/Writer/Renderer/Feed/RssTest.php
+++ b/test/Writer/Renderer/Feed/RssTest.php
@@ -56,7 +56,7 @@ public function testFeedEncodingHasBeenSet()
         $this->validWriter->setEncoding('iso-8859-1');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('iso-8859-1', $feed->getEncoding());
     }
 
@@ -64,7 +64,7 @@ public function testFeedEncodingDefaultIsUsedIfEncodingNotSetByHand()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('UTF-8', $feed->getEncoding());
     }
 
@@ -72,7 +72,7 @@ public function testFeedTitleHasBeenSet()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('This is a test feed.', $feed->getTitle());
     }
 
@@ -94,7 +94,7 @@ public function testFeedTitleCharDataEncoding()
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $this->validWriter->setTitle('<>&\'"áéíóú');
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getTitle());
     }
 
@@ -102,7 +102,7 @@ public function testFeedDescriptionHasBeenSet()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('This is a test description.', $feed->getDescription());
     }
 
@@ -124,7 +124,7 @@ public function testFeedDescriptionCharDataEncoding()
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $this->validWriter->setDescription('<>&\'"áéíóú');
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getDescription());
     }
 
@@ -133,7 +133,7 @@ public function testFeedUpdatedDateHasBeenSet()
         $this->validWriter->setDateModified(1234567890);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals(1234567890, $feed->getDateModified()->getTimestamp());
     }
 
@@ -149,7 +149,7 @@ public function testFeedLastBuildDateHasBeenSet()
         $this->validWriter->setLastBuildDate(1234567890);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals(1234567890, $feed->getLastBuildDate()->getTimestamp());
     }
 
@@ -158,7 +158,7 @@ public function testFeedGeneratorHasBeenSet()
         $this->validWriter->setGenerator('FooFeedBuilder', '1.00', 'http://www.example.com');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('FooFeedBuilder 1.00 (http://www.example.com)', $feed->getGenerator());
     }
 
@@ -173,7 +173,7 @@ public function testFeedGeneratorDefaultIsUsedIfGeneratorNotSetByHand()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals(
             'Zend_Feed_Writer ' . Version::VERSION . ' (http://framework.zend.com)', $feed->getGenerator());
     }
@@ -183,7 +183,7 @@ public function testFeedLanguageHasBeenSet()
         $this->validWriter->setLanguage('fr');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('fr', $feed->getLanguage());
     }
 
@@ -198,7 +198,7 @@ public function testFeedLanguageDefaultIsUsedIfGeneratorNotSetByHand()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals(null, $feed->getLanguage());
     }
 
@@ -206,7 +206,7 @@ public function testFeedIncludesLinkToHtmlVersionOfFeed()
     {
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('http://www.example.com', $feed->getLink());
     }
 
@@ -229,7 +229,7 @@ public function testFeedIncludesLinkToXmlRssWhereRssAndAtomLinksAreProvided()
         $this->validWriter->setFeedLink('http://www.example.com/atom', 'atom');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('http://www.example.com/rss', $feed->getFeedLink());
         $xpath = new \DOMXPath($feed->getDomDocument());
         $this->assertEquals(1, $xpath->evaluate('/rss/channel/atom:link[@rel="self"]')->length);
@@ -240,7 +240,7 @@ public function testFeedIncludesLinkToXmlRssWhereTheFeedWillBeAvailable()
         $this->validWriter->setFeedLink('http://www.example.com/rss', 'rss');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('http://www.example.com/rss', $feed->getFeedLink());
     }
 
@@ -256,7 +256,7 @@ public function testBaseUrlCanBeSet()
         $this->validWriter->setBaseUrl('http://www.example.com/base');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('http://www.example.com/base', $feed->getBaseUrl());
     }
 
@@ -270,7 +270,7 @@ public function testFeedHoldsAnyAuthorAdded()
                                              'uri'  => 'http://www.example.com/joe']);
         $atomFeed = new Renderer\Feed\Rss($this->validWriter);
         $atomFeed->render();
-        $feed   = Reader\Reader::importString($atomFeed->saveXml());
+        $feed   = (new Reader\Reader())->importString($atomFeed->saveXml());
         $author = $feed->getAuthor();
         $this->assertEquals(['name'=> 'Joe'], $feed->getAuthor());
     }
@@ -285,7 +285,7 @@ public function testFeedAuthorCharDataEncoding()
                                             'uri'  => 'http://www.example.com/joe']);
         $atomFeed = new Renderer\Feed\Rss($this->validWriter);
         $atomFeed->render();
-        $feed   = Reader\Reader::importString($atomFeed->saveXml());
+        $feed   = (new Reader\Reader())->importString($atomFeed->saveXml());
         $author = $feed->getAuthor();
         $this->assertEquals(['name'=> '<>&\'"áéíóú'], $feed->getAuthor());
     }
@@ -295,7 +295,7 @@ public function testCopyrightCanBeSet()
         $this->validWriter->setCopyright('Copyright © 2009 Paddy');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('Copyright © 2009 Paddy', $feed->getCopyright());
     }
 
@@ -307,7 +307,7 @@ public function testCopyrightCharDataEncoding()
         $this->validWriter->setCopyright('<>&\'"áéíóú');
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $this->assertEquals('<>&\'"áéíóú', $feed->getCopyright());
     }
 
@@ -321,7 +321,7 @@ public function testCategoriesCanBeSet()
                                            ]);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed     = Reader\Reader::importString($rssFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($rssFeed->saveXml());
         $expected = [
             ['term'   => 'cat_dog',
                   'label'  => 'cat_dog',
@@ -346,7 +346,7 @@ public function testCategoriesCharDataEncoding()
                                            ]);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed     = Reader\Reader::importString($rssFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($rssFeed->saveXml());
         $expected = [
             ['term'   => '<>&\'"áéíóú',
                   'label'  => '<>&\'"áéíóú',
@@ -365,7 +365,7 @@ public function testHubsCanBeSet()
         );
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed     = Reader\Reader::importString($rssFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($rssFeed->saveXml());
         $expected = [
             'http://www.example.com/hub', 'http://www.example.com/hub2'
         ];
@@ -384,7 +384,7 @@ public function testImageCanBeSet()
                                       ]);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed     = Reader\Reader::importString($rssFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($rssFeed->saveXml());
         $expected = [
             'uri'         => 'http://www.example.com/logo.gif',
             'link'        => 'http://www.example.com',
@@ -405,7 +405,7 @@ public function testImageCanBeSetWithOnlyRequiredElements()
                                       ]);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed     = Reader\Reader::importString($rssFeed->saveXml());
+        $feed     = (new Reader\Reader())->importString($rssFeed->saveXml());
         $expected = [
             'uri'   => 'http://www.example.com/logo.gif',
             'link'  => 'http://www.example.com',
@@ -584,7 +584,7 @@ public function testFeedSetDateCreated()
         $this->validWriter->setDateCreated(1234567890);
         $rssFeed = new Renderer\Feed\Rss($this->validWriter);
         $rssFeed->render();
-        $feed = Reader\Reader::importString($rssFeed->saveXml());
+        $feed = (new Reader\Reader())->importString($rssFeed->saveXml());
         $myDate = new DateTime('@' . 1234567890);
         $this->assertEquals($myDate, $feed->getDateCreated());
     }

From f8d0bfc65385ccdf8de13c0481250e1f0cbc1f1a Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 11:11:46 +0200
Subject: [PATCH 06/15] fix interface passing

---
 src/Reader/AbstractEntry.php              |  20 ++-
 src/Reader/Entry/AbstractEntry.php        |  25 +++-
 src/Reader/Entry/Atom.php                 |   4 +-
 src/Reader/Entry/Rss.php                  |   4 +-
 src/Reader/Extension/AbstractEntry.php    |  27 ++++
 src/Reader/Extension/Atom/Entry.php       |   2 +-
 src/Reader/Feed/AbstractFeed.php          |  33 +++--
 src/Reader/Feed/Atom.php                  |   6 +-
 src/Reader/Feed/Atom/Source.php           |   7 +-
 src/Reader/Feed/Rss.php                   |   6 +-
 src/Reader/Reader.php                     | 142 +++++++++++-----------
 src/Reader/StandaloneExtensionManager.php |  29 ++++-
 12 files changed, 208 insertions(+), 97 deletions(-)

diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index 78f8f60f..b05e883d 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -22,6 +22,13 @@ abstract class AbstractEntry
      */
     protected $data = [];
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader\Reader
+     */
+    protected $reader = null;
+
     /**
      * DOM document object
      *
@@ -64,8 +71,9 @@ abstract class AbstractEntry
      * @param  int $entryKey
      * @param  null|string $type
      */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
+    public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey, $type = null)
     {
+        $this->reader      = $reader;
         $this->entry       = $entry;
         $this->entryKey    = $entryKey;
         $this->domDocument = $entry->ownerDocument;
@@ -77,6 +85,16 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         $this->_loadExtensions();
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Get the DOM
      *
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index 719a5e5a..413f8957 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -24,6 +24,13 @@ abstract class AbstractEntry
      */
     protected $data = [];
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader\Reader
+     */
+    protected $reader = null;
+
     /**
      * DOM document object
      *
@@ -66,8 +73,9 @@ abstract class AbstractEntry
      * @param  int $entryKey
      * @param  string $type
      */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
+    public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey, $type = null)
     {
+        $this->reader      = $reader;
         $this->entry       = $entry;
         $this->entryKey    = $entryKey;
         $this->domDocument = $entry->ownerDocument;
@@ -81,6 +89,16 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         $this->loadExtensions();
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Get the DOM
      *
@@ -216,8 +234,9 @@ public function __call($method, $args)
      */
     protected function loadExtensions()
     {
-        $all     = (new Reader\Reader())->getExtensions();
-        $manager = (new Reader\Reader())->getExtensionManager();
+        $all     = $this->getReader()->getExtensions();
+        $manager = $this->getReader()->getExtensionManager();
+
         $feed    = $all['entry'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index 8a194534..1f514cca 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -29,9 +29,9 @@ class Atom extends AbstractEntry implements EntryInterface
      * @param  int $entryKey
      * @param  string $type
      */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
+    public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey, $type = null)
     {
-        parent::__construct($entry, $entryKey, $type);
+        parent::__construct($reader, $entry, $entryKey, $type);
 
         // Everyone by now should know XPath indices start from 1 not 0
         $this->xpathQuery = '//atom:entry[' . ($this->entryKey + 1) . ']';
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index 956a0220..bf7bf41c 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -38,9 +38,9 @@ class Rss extends AbstractEntry implements EntryInterface
      * @param  string $entryKey
      * @param  string $type
      */
-    public function __construct(DOMElement $entry, $entryKey, $type = null)
+    public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey, $type = null)
     {
-        parent::__construct($entry, $entryKey, $type);
+        parent::__construct($reader, $entry, $entryKey, $type);
         $this->xpathQueryRss = '//item[' . ($this->entryKey+1) . ']';
         $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
 
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index 35848552..bda527fa 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -58,6 +58,33 @@ abstract class AbstractEntry
      */
     protected $xpathPrefix = '';
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader
+     */
+    protected $reader = null;
+
+    /**
+     * Constructor
+     *
+     * @param  Reader\Reader $reader
+     */
+    public function __construct(Reader\Reader $reader)
+    {
+        $this->reader = $reader;
+    }
+
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Set the entry DOMElement
      *
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index d38e5c98..e60c9edf 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -537,7 +537,7 @@ public function getSource()
             $list = $this->getXpath()->query($this->getXpathPrefix() . '/atom:source[1]');
             if ($list->length) {
                 $element = $list->item(0);
-                $source = new Reader\Feed\Atom\Source($element, $this->getXpathPrefix());
+                $source = new Reader\Feed\Atom\Source($this->getReader(), $element, $this->getXpathPrefix());
             }
         }
 
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 03b219f2..2b091cd7 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -26,6 +26,13 @@ abstract class AbstractFeed implements FeedInterface
      */
     protected $data = [];
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader\Reader
+     */
+    protected $reader = null;
+
     /**
      * Parsed feed data in the shape of a DOMDocument
      *
@@ -74,15 +81,17 @@ abstract class AbstractFeed implements FeedInterface
      * @param DOMDocument $domDocument The DOM object for the feed's XML
      * @param string $type Feed type
      */
-    public function __construct(DOMDocument $domDocument, $type = null)
+    public function __construct(Reader\Reader $reader, DOMDocument $domDocument, $type = null)
     {
+
+        $this->reader      = $reader;
         $this->domDocument = $domDocument;
-        $this->xpath = new DOMXPath($this->domDocument);
+        $this->xpath       = new DOMXPath($this->domDocument);
 
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = (new Reader\Reader())->detectType($this->domDocument);
+            $this->data['type'] = $this->getReader()->detectType($this->domDocument);
         }
         $this->registerNamespaces();
         $this->indexEntries();
@@ -131,9 +140,9 @@ public function count()
     public function current()
     {
         if (substr($this->getType(), 0, 3) == 'rss') {
-            $reader = new Reader\Entry\Rss($this->entries[$this->key()], $this->key(), $this->getType());
+            $reader = new Reader\Entry\Rss($this->getReader(), $this->entries[$this->key()], $this->key(), $this->getType());
         } else {
-            $reader = new Reader\Entry\Atom($this->entries[$this->key()], $this->key(), $this->getType());
+            $reader = new Reader\Entry\Atom($this->getReader(), $this->entries[$this->key()], $this->key(), $this->getType());
         }
 
         $reader->setXpath($this->xpath);
@@ -141,6 +150,16 @@ public function current()
         return $reader;
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Get the DOM
      *
@@ -275,8 +294,8 @@ public function getExtension($name)
 
     protected function loadExtensions()
     {
-        $all     = (new Reader\Reader())->getExtensions();
-        $manager = (new Reader\Reader())->getExtensionManager();
+        $all     = $this->getReader()->getExtensions();
+        $manager = $this->getReader()->getExtensionManager();
         $feed    = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index e0d187c0..89cce5db 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -22,10 +22,10 @@ class Atom extends AbstractFeed
      * @param  DOMDocument $dom
      * @param  string $type
      */
-    public function __construct(DOMDocument $dom, $type = null)
+    public function __construct(Reader\Reader $reader, DOMDocument $dom, $type = null)
     {
-        parent::__construct($dom, $type);
-        $manager = (new Reader\Reader())->getExtensionManager();
+        parent::__construct($reader, $dom, $type);
+        $manager = $this->getReader()->getExtensionManager();
 
         $atomFeed = $manager->get('Atom\Feed');
         $atomFeed->setDomDocument($dom);
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index 26f7f4c5..d8927f10 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -27,10 +27,11 @@ class Source extends Feed\Atom
      * @param string $xpathPrefix Passed from parent Entry object
      * @param string $type Nearly always Atom 1.0
      */
-    public function __construct(DOMElement $source, $xpathPrefix, $type = Reader\Reader::TYPE_ATOM_10)
+    public function __construct(Reader\Reader $reader, DOMElement $source, $xpathPrefix, $type = Reader\Reader::TYPE_ATOM_10)
     {
-        $this->domDocument = $source->ownerDocument;
-        $this->xpath = new DOMXPath($this->domDocument);
+        $this->reader       = $reader;
+        $this->domDocument  = $source->ownerDocument;
+        $this->xpath        = new DOMXPath($this->domDocument);
         $this->data['type'] = $type;
         $this->registerNamespaces();
         $this->loadExtensions();
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index 5604993b..bfc96073 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -25,11 +25,11 @@ class Rss extends AbstractFeed
      * @param  DOMDocument $dom
      * @param  string $type
      */
-    public function __construct(DOMDocument $dom, $type = null)
+    public function __construct(Reader\Reader $reader, DOMDocument $dom, $type = null)
     {
-        parent::__construct($dom, $type);
+        parent::__construct($reader, $dom, $type);
 
-        $manager = (new Reader\Reader())->getExtensionManager();
+        $manager = $this->getReader()->getExtensionManager();
 
         $feed = $manager->get('DublinCore\Feed');
         $feed->setDomDocument($dom);
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 8d8f5c39..0cb99ea1 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -94,11 +94,10 @@ class Reader implements ReaderImportInterface
 
 
     /**
-     * Construct a new reader object
+     * Constructor
      *
      * @param  Http\ClientInterface $httpClient
      * @param  CacheStorage $cache
-     * @return Zend\Feed\Reader\Reader
      */
     public function __construct(Http\ClientInterface $httpClient = null, CacheStorage $cache = null)
     {
@@ -218,66 +217,66 @@ public function import($uri, $etag = null, $lastModified = null)
         $client  = $this->getHttpClient();
         $cacheId = 'Zend_Feed_Reader_' . md5($uri);
 
-        if (static::$httpConditionalGet && $cache) {
-            $headers = [];
-            $data    = $cache->getItem($cacheId);
-            if ($data && $client instanceof Http\HeaderAwareClientInterface) {
-                // Only check for ETag and last modified values in the cache
-                // if we have a client capable of emitting headers in the first place.
-                if ($etag === null) {
-                    $etag = $cache->getItem($cacheId . '_etag');
-                }
-                if ($lastModified === null) {
-                    $lastModified = $cache->getItem($cacheId . '_lastmodified');
-                }
-                if ($etag) {
-                    $headers['If-None-Match'] = [$etag];
-                }
-                if ($lastModified) {
-                    $headers['If-Modified-Since'] = [$lastModified];
-                }
-            }
-            $response = $client->get($uri, $headers);
-            if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            if ($response->getStatusCode() == 304) {
-                $responseXml = $data;
-            } else {
-                $responseXml = $response->getBody();
-                $cache->setItem($cacheId, $responseXml);
-
-                if ($response instanceof Http\HeaderAwareResponseInterface) {
-                    if ($response->getHeaderLine('ETag', false)) {
-                        $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
-                    }
-                    if ($response->getHeaderLine('Last-Modified', false)) {
-                        $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
-                    }
-                }
-            }
-            return static::importString($responseXml);
-        } elseif ($cache) {
-            $data = $cache->getItem($cacheId);
-            if ($data) {
-                return static::importString($data);
-            }
-            $response = $client->get($uri);
-            if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            $responseXml = $response->getBody();
-            $cache->setItem($cacheId, $responseXml);
-            return static::importString($responseXml);
-        } else {
+        // if ($this->httpConditionalGet && $cache) {
+        //     $headers = [];
+        //     $data    = $cache->getItem($cacheId);
+        //     if ($data && $client instanceof Http\HeaderAwareClientInterface) {
+        //         // Only check for ETag and last modified values in the cache
+        //         // if we have a client capable of emitting headers in the first place.
+        //         if ($etag === null) {
+        //             $etag = $cache->getItem($cacheId . '_etag');
+        //         }
+        //         if ($lastModified === null) {
+        //             $lastModified = $cache->getItem($cacheId . '_lastmodified');
+        //         }
+        //         if ($etag) {
+        //             $headers['If-None-Match'] = [$etag];
+        //         }
+        //         if ($lastModified) {
+        //             $headers['If-Modified-Since'] = [$lastModified];
+        //         }
+        //     }
+        //     $response = $client->get($uri, $headers);
+        //     if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
+        //         throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+        //     }
+        //     if ($response->getStatusCode() == 304) {
+        //         $responseXml = $data;
+        //     } else {
+        //         $responseXml = $response->getBody();
+        //         $cache->setItem($cacheId, $responseXml);
+
+        //         if ($response instanceof Http\HeaderAwareResponseInterface) {
+        //             if ($response->getHeaderLine('ETag', false)) {
+        //                 $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
+        //             }
+        //             if ($response->getHeaderLine('Last-Modified', false)) {
+        //                 $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
+        //             }
+        //         }
+        //     }
+        //     return $this->importString($responseXml);
+        // } elseif ($cache) {
+        //     $data = $cache->getItem($cacheId);
+        //     if ($data) {
+        //         return $this->importString($data);
+        //     }
+        //     $response = $client->get($uri);
+        //     if ((int) $response->getStatusCode() !== 200) {
+        //         throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+        //     }
+        //     $responseXml = $response->getBody();
+        //     $cache->setItem($cacheId, $responseXml);
+        //     return $this->importString($responseXml);
+        // } else {
             $response = $client->get($uri);
             if ((int) $response->getStatusCode() !== 200) {
                 throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
             }
-            $reader = static::importString($response->getBody());
+            $reader = $this->importString($response->getBody());
             $reader->setOriginalSourceUri($uri);
             return $reader;
-        }
+        // }
     }
 
     /**
@@ -308,7 +307,7 @@ public function importRemoteFeed($uri, Http\ClientInterface $client)
         if ((int) $response->getStatusCode() !== 200) {
             throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
         }
-        $reader = static::importString($response->getBody());
+        $reader = $this->importString($response->getBody());
         $reader->setOriginalSourceUri($uri);
         return $reader;
     }
@@ -356,19 +355,19 @@ public function importString($string)
 
         $type = $this->detectType($dom);
 
-        static::registerCoreExtensions();
+        $this->registerCoreExtensions();
 
         if (substr($type, 0, 3) == 'rss') {
-            $reader = new Feed\Rss($dom, $type);
-        } elseif (substr($type, 8, 5) == 'entry') {
-            $reader = new Entry\Atom($dom->documentElement, 0, self::TYPE_ATOM_10);
-        } elseif (substr($type, 0, 4) == 'atom') {
-            $reader = new Feed\Atom($dom, $type);
-        } else {
-            throw new Exception\RuntimeException('The URI used does not point to a '
-            . 'valid Atom, RSS or RDF feed that Zend\Feed\Reader can parse.');
+            return new Feed\Rss($this, $dom, $type);
         }
-        return $reader;
+        if (substr($type, 8, 5) == 'entry') {
+            return new Entry\Atom($this, $dom->documentElement, 0, self::TYPE_ATOM_10);
+        }
+        if (substr($type, 0, 4) == 'atom') {
+            return new Feed\Atom($this, $dom, $type);
+        }
+        throw new Exception\RuntimeException('The URI used does not point to a '
+        . 'valid Atom, RSS or RDF feed that Zend\Feed\Reader can parse.');
     }
 
     /**
@@ -386,7 +385,7 @@ public function importFile($filename)
         if ($feed === false) {
             throw new Exception\RuntimeException("File '{$filename}' could not be loaded", 0, $err);
         }
-        return static::importString($feed);
+        return $this->importString($feed);
     }
 
     /**
@@ -570,7 +569,7 @@ public function setExtensionManager(ExtensionManagerInterface $extensionManager)
     public function getExtensionManager()
     {
         if (!isset($this->extensionManager)) {
-            $this->setExtensionManager(new StandaloneExtensionManager());
+            $this->setExtensionManager(new StandaloneExtensionManager($this));
         }
         return $this->extensionManager;
     }
@@ -586,8 +585,9 @@ public function registerExtension($name)
     {
         $feedName  = $name . '\Feed';
         $entryName = $name . '\Entry';
-        $manager   = $this->getExtensionManager();
-        if (static::isRegistered($name)) {
+        $manager   = $this->getExtensionManager($this);
+
+        if ($this->isRegistered($name)) {
             if ($manager->has($feedName) || $manager->has($entryName)) {
                 return;
             }
diff --git a/src/Reader/StandaloneExtensionManager.php b/src/Reader/StandaloneExtensionManager.php
index 9d9fcad9..ed0e9870 100644
--- a/src/Reader/StandaloneExtensionManager.php
+++ b/src/Reader/StandaloneExtensionManager.php
@@ -27,6 +27,33 @@ class StandaloneExtensionManager implements ExtensionManagerInterface
         'WellFormedWeb\Entry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
     ];
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader
+     */
+    protected $reader = null;
+
+    /**
+     * Constructor
+     *
+     * @param  Reader\Reader $reader
+     */
+    public function __construct(Reader $reader)
+    {
+        $this->reader = $reader;
+    }
+
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Do we have the extension?
      *
@@ -47,6 +74,6 @@ public function has($extension)
     public function get($extension)
     {
         $class = $this->extensions[$extension];
-        return new $class();
+        return new $class($this->getReader());
     }
 }

From a3c80a4992b289af2dfb3c9c43ba231e1d6614b3 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 11:28:58 +0200
Subject: [PATCH 07/15] redeveloping tests

---
 src/Reader/Extension/AbstractEntry.php    |  4 ++--
 src/Reader/Extension/AbstractFeed.php     | 27 +++++++++++++++++++++
 src/Reader/Extension/Atom/Entry.php       |  3 +++
 src/Reader/Feed/AbstractFeed.php          |  1 +
 src/Reader/Reader.php                     |  2 +-
 src/Reader/StandaloneExtensionManager.php | 29 +----------------------
 test/Reader/Entry/CommonTest.php          |  4 ++--
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index bda527fa..f29fa902 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -66,11 +66,11 @@ abstract class AbstractEntry
     protected $reader = null;
 
     /**
-     * Constructor
+     * Set the entry Feed Reader
      *
      * @param  Reader\Reader $reader
      */
-    public function __construct(Reader\Reader $reader)
+    public function setReader(Reader\Reader $reader)
     {
         $this->reader = $reader;
     }
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index 09069e12..5b3640e1 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -43,6 +43,33 @@ abstract class AbstractFeed
      */
     protected $xpathPrefix = '';
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader
+     */
+    protected $reader = null;
+
+    /**
+     * Set the entry Feed Reader
+     *
+     * @param  Reader\Reader $reader
+     */
+    public function setReader(Reader\Reader $reader)
+    {
+        $this->reader = $reader;
+    }
+
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Set the DOM document
      *
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index e60c9edf..aedbc975 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -531,6 +531,9 @@ public function getSource()
             return $this->data['source'];
         }
 
+        throw new \InvalidArgumentException('xxx');
+        die();
+
         $source = null;
         // TODO: Investigate why _getAtomType() fails here. Is it even needed?
         if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index 2b091cd7..dd318445 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -305,6 +305,7 @@ protected function loadExtensions()
                 throw new Exception\RuntimeException(sprintf('Unable to load extension "%s"; cannot find class', $extension));
             }
             $plugin = $manager->get($extension);
+            $plugin->setReader($this->getReader());
             $plugin->setDomDocument($this->getDomDocument());
             $plugin->setType($this->data['type']);
             $plugin->setXpath($this->xpath);
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 0cb99ea1..203b45ec 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -585,7 +585,7 @@ public function registerExtension($name)
     {
         $feedName  = $name . '\Feed';
         $entryName = $name . '\Entry';
-        $manager   = $this->getExtensionManager($this);
+        $manager   = $this->getExtensionManager();
 
         if ($this->isRegistered($name)) {
             if ($manager->has($feedName) || $manager->has($entryName)) {
diff --git a/src/Reader/StandaloneExtensionManager.php b/src/Reader/StandaloneExtensionManager.php
index ed0e9870..9d9fcad9 100644
--- a/src/Reader/StandaloneExtensionManager.php
+++ b/src/Reader/StandaloneExtensionManager.php
@@ -27,33 +27,6 @@ class StandaloneExtensionManager implements ExtensionManagerInterface
         'WellFormedWeb\Entry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
     ];
 
-    /**
-     * Feed Reader instance
-     *
-     * @var Reader
-     */
-    protected $reader = null;
-
-    /**
-     * Constructor
-     *
-     * @param  Reader\Reader $reader
-     */
-    public function __construct(Reader $reader)
-    {
-        $this->reader = $reader;
-    }
-
-    /**
-     * Get Feed Reader
-     *
-     * @return Reader
-     */
-    public function getReader()
-    {
-        return $this->reader;
-    }
-
     /**
      * Do we have the extension?
      *
@@ -74,6 +47,6 @@ public function has($extension)
     public function get($extension)
     {
         $class = $this->extensions[$extension];
-        return new $class($this->getReader());
+        return new $class();
     }
 }
diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
index ccca7f6e..cdfa16d2 100644
--- a/test/Reader/Entry/CommonTest.php
+++ b/test/Reader/Entry/CommonTest.php
@@ -127,7 +127,7 @@ public function testFeedEntryCanDetectFeedType()
         $entry = $feed->current();
         $stub = $this->getMockForAbstractClass(
             'Zend\Feed\Reader\Entry\AbstractEntry',
-            [$entry->getElement(), $entry->getId()]
+            [new Reader\Reader(), $entry->getElement(), $entry->getId()]
         );
         $this->assertEquals($entry->getType(), $stub->getType());
     }
@@ -144,7 +144,7 @@ public function testFeedEntryCanSetAnyType()
         $domElement = new \DOMElement($entry->getElement()->tagName);
         $stub = $this->getMockForAbstractClass(
             'Zend\Feed\Reader\Entry\AbstractEntry',
-            [$domElement, $entry->getId()]
+            [new Reader\Reader(), $domElement, $entry->getId()]
         );
         $this->assertEquals($stub->getType(), Reader\Reader::TYPE_ANY);
     }

From 821875abce49ef44f2f1a0ae94be3d0b14aaad62 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:09:58 +0200
Subject: [PATCH 08/15] integrate feed reader entity into plugins

---
 src/Reader/AbstractFeed.php               | 1 +
 src/Reader/Entry/AbstractEntry.php        | 3 ++-
 src/Reader/Entry/Atom.php                 | 3 ++-
 src/Reader/Entry/Rss.php                  | 5 +++--
 src/Reader/Extension/AbstractEntry.php    | 2 +-
 src/Reader/Extension/AbstractFeed.php     | 2 +-
 src/Reader/Extension/Atom/Entry.php       | 5 +----
 src/Reader/Extension/Atom/Feed.php        | 2 +-
 src/Reader/Extension/DublinCore/Entry.php | 2 +-
 src/Reader/Extension/DublinCore/Feed.php  | 2 +-
 src/Reader/Feed/Atom.php                  | 2 ++
 src/Reader/Feed/Atom/Source.php           | 3 ++-
 src/Reader/Feed/Rss.php                   | 4 +++-
 13 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index fbc2bfa7..878c8477 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -279,6 +279,7 @@ protected function loadExtensions()
                 continue;
             }
             $plugin = $manager->get($extension);
+            $plugin->setReader($this->getReader());
             $plugin->setDomDocument($this->getDomDocument());
             $plugin->setType($this->data['type']);
             $plugin->setXpath($this->xpath);
diff --git a/src/Reader/Entry/AbstractEntry.php b/src/Reader/Entry/AbstractEntry.php
index 413f8957..4e63e490 100644
--- a/src/Reader/Entry/AbstractEntry.php
+++ b/src/Reader/Entry/AbstractEntry.php
@@ -82,7 +82,7 @@ public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey,
         if ($type !== null) {
             $this->data['type'] = $type;
         } elseif ($this->domDocument !== null) {
-            $this->data['type'] = (new Reader\Reader())->detectType($this->domDocument);
+            $this->data['type'] = $this->getReader()->detectType($this->domDocument);
         } else {
             $this->data['type'] = Reader\Reader::TYPE_ANY;
         }
@@ -243,6 +243,7 @@ protected function loadExtensions()
                 continue;
             }
             $plugin = $manager->get($extension);
+            $plugin->setReader($this->getReader());
             $plugin->setEntryElement($this->getElement());
             $plugin->setEntryKey($this->entryKey);
             $plugin->setType($this->data['type']);
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
index 1f514cca..264b57bc 100644
--- a/src/Reader/Entry/Atom.php
+++ b/src/Reader/Entry/Atom.php
@@ -36,11 +36,12 @@ public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey,
         // Everyone by now should know XPath indices start from 1 not 0
         $this->xpathQuery = '//atom:entry[' . ($this->entryKey + 1) . ']';
 
-        $manager    = (new Reader\Reader())->getExtensionManager();
+        $manager    = $this->getReader()->getExtensionManager();
         $extensions = ['Atom\Entry', 'Thread\Entry', 'DublinCore\Entry'];
 
         foreach ($extensions as $name) {
             $extension = $manager->get($name);
+            $extension->setReader($this->getReader());
             $extension->setEntryElement($entry);
             $extension->setEntryKey($entryKey);
             $extension->setType($type);
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
index bf7bf41c..719d8cfb 100644
--- a/src/Reader/Entry/Rss.php
+++ b/src/Reader/Entry/Rss.php
@@ -44,7 +44,7 @@ public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey,
         $this->xpathQueryRss = '//item[' . ($this->entryKey+1) . ']';
         $this->xpathQueryRdf = '//rss:item[' . ($this->entryKey+1) . ']';
 
-        $manager    = (new Reader\Reader())->getExtensionManager();
+        $manager    = $this->getReader()->getExtensionManager();
         $extensions = [
             'DublinCore\Entry',
             'Content\Entry',
@@ -55,6 +55,7 @@ public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey,
         ];
         foreach ($extensions as $name) {
             $extension = $manager->get($name);
+            $extension->setReader($this->getReader());
             $extension->setEntryElement($entry);
             $extension->setEntryKey($entryKey);
             $extension->setType($type);
@@ -125,7 +126,7 @@ public function getAuthors()
             $authors = $this->getExtension('Atom')->getAuthors();
         } else {
             $authors = new Reader\Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Extension/AbstractEntry.php b/src/Reader/Extension/AbstractEntry.php
index f29fa902..c0340c40 100644
--- a/src/Reader/Extension/AbstractEntry.php
+++ b/src/Reader/Extension/AbstractEntry.php
@@ -186,7 +186,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if ($type === null) {
-            $type = (new Reader\Reader())->detectType($this->getEntryElement(), true);
+            $type = $this->getReader()->detectType($this->getEntryElement(), true);
             $this->setType($type);
         }
 
diff --git a/src/Reader/Extension/AbstractFeed.php b/src/Reader/Extension/AbstractFeed.php
index 5b3640e1..85776380 100644
--- a/src/Reader/Extension/AbstractFeed.php
+++ b/src/Reader/Extension/AbstractFeed.php
@@ -126,7 +126,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if (null === $type) {
-            $type = (new Reader\Reader())->detectType($this->getDomDocument());
+            $type = $this->getReader()->detectType($this->getDomDocument());
             $this->setType($type);
         }
         return $type;
diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
index aedbc975..b52e89fd 100644
--- a/src/Reader/Extension/Atom/Entry.php
+++ b/src/Reader/Extension/Atom/Entry.php
@@ -71,7 +71,7 @@ public function getAuthors()
             $authors = new Collection\Author();
         } else {
             $authors = new Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 
@@ -531,9 +531,6 @@ public function getSource()
             return $this->data['source'];
         }
 
-        throw new \InvalidArgumentException('xxx');
-        die();
-
         $source = null;
         // TODO: Investigate why _getAtomType() fails here. Is it even needed?
         if ($this->getType() == Reader\Reader::TYPE_ATOM_10) {
diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
index 1cf4ef0f..b04d4eed 100644
--- a/src/Reader/Extension/Atom/Feed.php
+++ b/src/Reader/Extension/Atom/Feed.php
@@ -63,7 +63,7 @@ public function getAuthors()
             $authors = new Collection\Author();
         } else {
             $authors = new Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 
diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index a9d4f576..a108b507 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -65,7 +65,7 @@ public function getAuthors()
                 ];
             }
             $authors = new Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         } else {
             $authors = null;
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index 48b555eb..d6734d51 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -65,7 +65,7 @@ public function getAuthors()
                 ];
             }
             $authors = new Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         } else {
             $authors = null;
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
index 89cce5db..f893c10d 100644
--- a/src/Reader/Feed/Atom.php
+++ b/src/Reader/Feed/Atom.php
@@ -28,12 +28,14 @@ public function __construct(Reader\Reader $reader, DOMDocument $dom, $type = nul
         $manager = $this->getReader()->getExtensionManager();
 
         $atomFeed = $manager->get('Atom\Feed');
+        $atomFeed->setReader($this->getReader());
         $atomFeed->setDomDocument($dom);
         $atomFeed->setType($this->data['type']);
         $atomFeed->setXpath($this->xpath);
         $this->extensions['Atom\\Feed'] = $atomFeed;
 
         $atomFeed = $manager->get('DublinCore\Feed');
+        $atomFeed->setReader($this->getReader());
         $atomFeed->setDomDocument($dom);
         $atomFeed->setType($this->data['type']);
         $atomFeed->setXpath($this->xpath);
diff --git a/src/Reader/Feed/Atom/Source.php b/src/Reader/Feed/Atom/Source.php
index d8927f10..73e957f4 100644
--- a/src/Reader/Feed/Atom/Source.php
+++ b/src/Reader/Feed/Atom/Source.php
@@ -36,11 +36,12 @@ public function __construct(Reader\Reader $reader, DOMElement $source, $xpathPre
         $this->registerNamespaces();
         $this->loadExtensions();
 
-        $manager = (new Reader\Reader())->getExtensionManager();
+        $manager = $this->getReader()->getExtensionManager();
         $extensions = ['Atom\Feed', 'DublinCore\Feed'];
 
         foreach ($extensions as $name) {
             $extension = $manager->get($name);
+            $extension->setReader($this->getReader());
             $extension->setDomDocument($this->domDocument);
             $extension->setType($this->data['type']);
             $extension->setXpath($this->xpath);
diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
index bfc96073..c75b7e90 100644
--- a/src/Reader/Feed/Rss.php
+++ b/src/Reader/Feed/Rss.php
@@ -32,12 +32,14 @@ public function __construct(Reader\Reader $reader, DOMDocument $dom, $type = nul
         $manager = $this->getReader()->getExtensionManager();
 
         $feed = $manager->get('DublinCore\Feed');
+        $feed->setReader($this->getReader());
         $feed->setDomDocument($dom);
         $feed->setType($this->data['type']);
         $feed->setXpath($this->xpath);
         $this->extensions['DublinCore\Feed'] = $feed;
 
         $feed = $manager->get('Atom\Feed');
+        $feed->setReader($this->getReader());
         $feed->setDomDocument($dom);
         $feed->setType($this->data['type']);
         $feed->setXpath($this->xpath);
@@ -122,7 +124,7 @@ public function getAuthors()
             $authors = $this->getExtension('Atom')->getAuthors();
         } else {
             $authors = new Reader\Collection\Author(
-                (new Reader\Reader())->arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 

From 676b1ee949fed0616ad7ddb617427280b1433f1b Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:11:24 +0200
Subject: [PATCH 09/15] reader migrated

---
 src/Reader/Reader.php | 123 ++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 70 deletions(-)

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 203b45ec..023684a2 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -92,23 +92,6 @@ class Reader implements ReaderImportInterface
         ]
     ];
 
-
-    /**
-     * Constructor
-     *
-     * @param  Http\ClientInterface $httpClient
-     * @param  CacheStorage $cache
-     */
-    public function __construct(Http\ClientInterface $httpClient = null, CacheStorage $cache = null)
-    {
-        if (!is_null($httpClient)) {
-            $this->setHttpClient($httpClient);
-        }
-        if (!is_null($cache)) {
-            $this->setCache($cache);
-        }
-    }
-
     /**
      * Get the Feed cache
      *
@@ -217,58 +200,58 @@ public function import($uri, $etag = null, $lastModified = null)
         $client  = $this->getHttpClient();
         $cacheId = 'Zend_Feed_Reader_' . md5($uri);
 
-        // if ($this->httpConditionalGet && $cache) {
-        //     $headers = [];
-        //     $data    = $cache->getItem($cacheId);
-        //     if ($data && $client instanceof Http\HeaderAwareClientInterface) {
-        //         // Only check for ETag and last modified values in the cache
-        //         // if we have a client capable of emitting headers in the first place.
-        //         if ($etag === null) {
-        //             $etag = $cache->getItem($cacheId . '_etag');
-        //         }
-        //         if ($lastModified === null) {
-        //             $lastModified = $cache->getItem($cacheId . '_lastmodified');
-        //         }
-        //         if ($etag) {
-        //             $headers['If-None-Match'] = [$etag];
-        //         }
-        //         if ($lastModified) {
-        //             $headers['If-Modified-Since'] = [$lastModified];
-        //         }
-        //     }
-        //     $response = $client->get($uri, $headers);
-        //     if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
-        //         throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-        //     }
-        //     if ($response->getStatusCode() == 304) {
-        //         $responseXml = $data;
-        //     } else {
-        //         $responseXml = $response->getBody();
-        //         $cache->setItem($cacheId, $responseXml);
-
-        //         if ($response instanceof Http\HeaderAwareResponseInterface) {
-        //             if ($response->getHeaderLine('ETag', false)) {
-        //                 $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
-        //             }
-        //             if ($response->getHeaderLine('Last-Modified', false)) {
-        //                 $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
-        //             }
-        //         }
-        //     }
-        //     return $this->importString($responseXml);
-        // } elseif ($cache) {
-        //     $data = $cache->getItem($cacheId);
-        //     if ($data) {
-        //         return $this->importString($data);
-        //     }
-        //     $response = $client->get($uri);
-        //     if ((int) $response->getStatusCode() !== 200) {
-        //         throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-        //     }
-        //     $responseXml = $response->getBody();
-        //     $cache->setItem($cacheId, $responseXml);
-        //     return $this->importString($responseXml);
-        // } else {
+        if ($this->httpConditionalGet && $cache) {
+            $headers = [];
+            $data    = $cache->getItem($cacheId);
+            if ($data && $client instanceof Http\HeaderAwareClientInterface) {
+                // Only check for ETag and last modified values in the cache
+                // if we have a client capable of emitting headers in the first place.
+                if ($etag === null) {
+                    $etag = $cache->getItem($cacheId . '_etag');
+                }
+                if ($lastModified === null) {
+                    $lastModified = $cache->getItem($cacheId . '_lastmodified');
+                }
+                if ($etag) {
+                    $headers['If-None-Match'] = [$etag];
+                }
+                if ($lastModified) {
+                    $headers['If-Modified-Since'] = [$lastModified];
+                }
+            }
+            $response = $client->get($uri, $headers);
+            if ($response->getStatusCode() !== 200 && $response->getStatusCode() !== 304) {
+                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+            }
+            if ($response->getStatusCode() == 304) {
+                $responseXml = $data;
+            } else {
+                $responseXml = $response->getBody();
+                $cache->setItem($cacheId, $responseXml);
+
+                if ($response instanceof Http\HeaderAwareResponseInterface) {
+                    if ($response->getHeaderLine('ETag', false)) {
+                        $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
+                    }
+                    if ($response->getHeaderLine('Last-Modified', false)) {
+                        $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
+                    }
+                }
+            }
+            return $this->importString($responseXml);
+        } elseif ($cache) {
+            $data = $cache->getItem($cacheId);
+            if ($data) {
+                return $this->importString($data);
+            }
+            $response = $client->get($uri);
+            if ((int) $response->getStatusCode() !== 200) {
+                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+            }
+            $responseXml = $response->getBody();
+            $cache->setItem($cacheId, $responseXml);
+            return $this->importString($responseXml);
+        } else {
             $response = $client->get($uri);
             if ((int) $response->getStatusCode() !== 200) {
                 throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
@@ -276,7 +259,7 @@ public function import($uri, $etag = null, $lastModified = null)
             $reader = $this->importString($response->getBody());
             $reader->setOriginalSourceUri($uri);
             return $reader;
-        // }
+        }
     }
 
     /**

From 03e1150868ecb1c5e85d82540ff5f21125dd3889 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:24:30 +0200
Subject: [PATCH 10/15] loading

---
 src/Reader/AbstractEntry.php | 6 +++---
 src/Reader/FeedSet.php       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Reader/AbstractEntry.php b/src/Reader/AbstractEntry.php
index b05e883d..51fbba0d 100644
--- a/src/Reader/AbstractEntry.php
+++ b/src/Reader/AbstractEntry.php
@@ -80,7 +80,7 @@ public function __construct(Reader\Reader $reader, DOMElement $entry, $entryKey,
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = Reader::detectType($entry);
+            $this->data['type'] = $this->getReader()->detectType($entry);
         }
         $this->_loadExtensions();
     }
@@ -227,13 +227,13 @@ public function __call($method, $args)
      */
     protected function _loadExtensions()
     {
-        $all = (new Reader())->getExtensions();
+        $all = $this->Reader()->getExtensions();
         $feed = $all['entry'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
                 continue;
             }
-            $className = Reader::getPluginLoader()->getClassName($extension);
+            $className = $this->getReader()->getPluginLoader()->getClassName($extension);
             $this->extensions[$extension] = new $className(
                 $this->getElement(), $this->entryKey, $this->data['type']
             );
diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index d8905328..d5e03d43 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -121,7 +121,7 @@ public function offsetGet($offset)
             if (!$this->offsetExists('href')) {
                 return;
             }
-            $feed = Reader::import($this->offsetGet('href'));
+            $feed = $this->getReader()->import($this->offsetGet('href'));
             $this->offsetSet('feed', $feed);
             return $feed;
         }

From c3d2317eb62aee654f4167999afc3d5afd9df2a1 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:27:23 +0200
Subject: [PATCH 11/15] fix abstract feed reader

---
 src/Reader/AbstractFeed.php | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Reader/AbstractFeed.php b/src/Reader/AbstractFeed.php
index 878c8477..f8e58689 100644
--- a/src/Reader/AbstractFeed.php
+++ b/src/Reader/AbstractFeed.php
@@ -22,6 +22,13 @@ abstract class AbstractFeed implements Feed\FeedInterface
      */
     protected $data = [];
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader\Reader
+     */
+    protected $reader = null;
+
     /**
      * Parsed feed data in the shape of a DOMDocument
      *
@@ -70,21 +77,32 @@ abstract class AbstractFeed implements Feed\FeedInterface
      * @param DomDocument $domDocument The DOM object for the feed's XML
      * @param string $type Feed type
      */
-    public function __construct(DOMDocument $domDocument, $type = null)
+    public function __construct(Reader\Reader $reader, DOMDocument $domDocument, $type = null)
     {
+        $this->reader      = $reader;
         $this->domDocument = $domDocument;
         $this->xpath = new DOMXPath($this->domDocument);
 
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = Reader::detectType($this->domDocument);
+            $this->data['type'] = $this->getReader()->detectType($this->domDocument);
         }
         $this->registerNamespaces();
         $this->indexEntries();
         $this->loadExtensions();
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Set an original source URI for the feed being parsed. This value
      * is returned from getFeedLink() method if the feed does not carry
@@ -271,8 +289,8 @@ public function getExtension($name)
 
     protected function loadExtensions()
     {
-        $all     = (new Reader())->getExtensions();
-        $manager = (new Reader())->getExtensionManager();
+        $all     = $this->getReader()->getExtensions();
+        $manager = $this->getReader()->getExtensionManager();
         $feed    = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {

From 7d67d4bb24e5ea2b4a8473543d7f6a975a5afe8c Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:30:22 +0200
Subject: [PATCH 12/15] fix code styles

---
 src/Reader/Extension/DublinCore/Entry.php | 1 -
 src/Reader/Extension/DublinCore/Feed.php  | 1 -
 src/Reader/Feed/AbstractFeed.php          | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
index a108b507..33d52dd4 100644
--- a/src/Reader/Extension/DublinCore/Entry.php
+++ b/src/Reader/Extension/DublinCore/Entry.php
@@ -10,7 +10,6 @@
 namespace Zend\Feed\Reader\Extension\DublinCore;
 
 use DateTime;
-use Zend\Feed\Reader;
 use Zend\Feed\Reader\Collection;
 use Zend\Feed\Reader\Extension;
 
diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
index d6734d51..261de783 100644
--- a/src/Reader/Extension/DublinCore/Feed.php
+++ b/src/Reader/Extension/DublinCore/Feed.php
@@ -10,7 +10,6 @@
 namespace Zend\Feed\Reader\Extension\DublinCore;
 
 use DateTime;
-use Zend\Feed\Reader;
 use Zend\Feed\Reader\Collection;
 use Zend\Feed\Reader\Extension;
 
diff --git a/src/Reader/Feed/AbstractFeed.php b/src/Reader/Feed/AbstractFeed.php
index dd318445..585549df 100644
--- a/src/Reader/Feed/AbstractFeed.php
+++ b/src/Reader/Feed/AbstractFeed.php
@@ -83,7 +83,6 @@ abstract class AbstractFeed implements FeedInterface
      */
     public function __construct(Reader\Reader $reader, DOMDocument $domDocument, $type = null)
     {
-
         $this->reader      = $reader;
         $this->domDocument = $domDocument;
         $this->xpath       = new DOMXPath($this->domDocument);

From fb0d3f3f60bd0ef300e30206fd1c91678a2e39bc Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 12:35:49 +0200
Subject: [PATCH 13/15] fix feedset lazy loading

---
 src/Reader/FeedSet.php | 27 +++++++++++++++++++++++++++
 src/Reader/Reader.php  |  1 +
 2 files changed, 28 insertions(+)

diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index d5e03d43..bd2db256 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -21,6 +21,33 @@ class FeedSet extends ArrayObject
 
     public $atom = null;
 
+    /**
+     * Feed Reader instance
+     *
+     * @var Reader
+     */
+    protected $reader = null;
+
+    /**
+     * Set the entry Feed Reader
+     *
+     * @param  Reader $reader
+     */
+    public function setReader(Reader $reader)
+    {
+        $this->reader = $reader;
+    }
+
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Import a DOMNodeList from any document containing a set of links
      * for alternate versions of a document, which will normally refer to
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 023684a2..8501b2ea 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -405,6 +405,7 @@ public function findFeedLinks($uri)
         }
         $feedSet = new FeedSet;
         $links = $dom->getElementsByTagName('link');
+        $feedSet->setReader($this);
         $feedSet->addLinks($links, $uri);
         return $feedSet;
     }

From c87a7641a9fac9f1e993e60dfd0884679fe1918a Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Sat, 20 Feb 2016 13:11:23 +0200
Subject: [PATCH 14/15] fix reader feed-set

---
 src/Reader/FeedSet.php     |  4 +++-
 src/Reader/Reader.php      | 19 ++++++++++---------
 test/Reader/ReaderTest.php |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Reader/FeedSet.php b/src/Reader/FeedSet.php
index bd2db256..39e01086 100644
--- a/src/Reader/FeedSet.php
+++ b/src/Reader/FeedSet.php
@@ -78,11 +78,13 @@ public function addLinks(DOMNodeList $links, $uri)
             } elseif (!isset($this->rdf) && $link->getAttribute('type') == 'application/rdf+xml') {
                 $this->rdf = $this->absolutiseUri(trim($link->getAttribute('href')), $uri);
             }
-            $this[] = new static([
+            $entity = new static([
                 'rel' => 'alternate',
                 'type' => $link->getAttribute('type'),
                 'href' => $this->absolutiseUri(trim($link->getAttribute('href')), $uri),
             ]);
+            $entity->setReader($this->getReader());
+            $this[] = $entity;
         }
     }
 
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index 8501b2ea..ecbabaab 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -239,7 +239,8 @@ public function import($uri, $etag = null, $lastModified = null)
                 }
             }
             return $this->importString($responseXml);
-        } elseif ($cache) {
+        }
+        if ($cache) {
             $data = $cache->getItem($cacheId);
             if ($data) {
                 return $this->importString($data);
@@ -251,15 +252,15 @@ public function import($uri, $etag = null, $lastModified = null)
             $responseXml = $response->getBody();
             $cache->setItem($cacheId, $responseXml);
             return $this->importString($responseXml);
-        } else {
-            $response = $client->get($uri);
-            if ((int) $response->getStatusCode() !== 200) {
-                throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
-            }
-            $reader = $this->importString($response->getBody());
-            $reader->setOriginalSourceUri($uri);
-            return $reader;
         }
+
+        $response = $client->get($uri);
+        if ((int) $response->getStatusCode() !== 200) {
+            throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
+        }
+        $reader = $this->importString($response->getBody());
+        $reader->setOriginalSourceUri($uri);
+        return $reader;
     }
 
     /**
diff --git a/test/Reader/ReaderTest.php b/test/Reader/ReaderTest.php
index 473543bb..429d41f7 100644
--- a/test/Reader/ReaderTest.php
+++ b/test/Reader/ReaderTest.php
@@ -205,7 +205,7 @@ public function testZeroCountFeedSetReturnedFromEmptyList()
         if (!getenv('TESTS_ZEND_FEED_READER_ONLINE_ENABLED')) {
             $this->markTestSkipped('testGetsFeedLinksAsValueObject() requires a network connection');
         }
-        $links = (new Reader\Reader())->findFeedLinks('http://www.example.com');
+        $links = (new Reader\Reader())->findFeedLinks('http://www.google.com');
         $this->assertEquals(0, count($links));
     }
 

From 751901d5018253da1e7c917f87f1f9652f542c51 Mon Sep 17 00:00:00 2001
From: Rostislav Mykhajliw <necromant2005@gmail.com>
Date: Mon, 22 Feb 2016 07:27:14 +0200
Subject: [PATCH 15/15] migrate to psr-6

---
 composer.json         |  3 ++-
 src/Reader/Reader.php | 32 +++++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 0183b5d7..f4cc7045 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
     "require": {
         "php": "^5.5 || ^7.0",
         "zendframework/zend-escaper": "^2.5",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+        "zendframework/zend-stdlib": "^2.7 || ^3.0",
+        "psr/cache": "*"
     },
     "require-dev": {
         "zendframework/zend-db": "^2.5",
diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
index ecbabaab..00aa9e75 100644
--- a/src/Reader/Reader.php
+++ b/src/Reader/Reader.php
@@ -11,7 +11,7 @@
 
 use DOMDocument;
 use DOMXPath;
-use Zend\Cache\Storage\StorageInterface as CacheStorage;
+use Psr\Cache\CacheItemPoolInterface as CacheStorage;
 use Zend\Http as ZendHttp;
 use Zend\Stdlib\ErrorHandler;
 use Zend\Feed\Reader\Exception\InvalidHttpClientException;
@@ -203,14 +203,14 @@ public function import($uri, $etag = null, $lastModified = null)
         if ($this->httpConditionalGet && $cache) {
             $headers = [];
             $data    = $cache->getItem($cacheId);
-            if ($data && $client instanceof Http\HeaderAwareClientInterface) {
+            if ($data->isHit() && $client instanceof Http\HeaderAwareClientInterface) {
                 // Only check for ETag and last modified values in the cache
                 // if we have a client capable of emitting headers in the first place.
                 if ($etag === null) {
-                    $etag = $cache->getItem($cacheId . '_etag');
+                    $etag = $cache->getItem($cacheId . '_etag')->get();
                 }
                 if ($lastModified === null) {
-                    $lastModified = $cache->getItem($cacheId . '_lastmodified');
+                    $lastModified = $cache->getItem($cacheId . '_lastmodified')->get();
                 }
                 if ($etag) {
                     $headers['If-None-Match'] = [$etag];
@@ -224,17 +224,23 @@ public function import($uri, $etag = null, $lastModified = null)
                 throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
             }
             if ($response->getStatusCode() == 304) {
-                $responseXml = $data;
+                $responseXml = $data->get();
             } else {
                 $responseXml = $response->getBody();
-                $cache->setItem($cacheId, $responseXml);
+                $item = $cache->getItem($cacheId);
+                $item->set($responseXml);
+                $cache->save($item);
 
                 if ($response instanceof Http\HeaderAwareResponseInterface) {
                     if ($response->getHeaderLine('ETag', false)) {
-                        $cache->setItem($cacheId . '_etag', $response->getHeaderLine('ETag'));
+                        $item = $cache->get($cacheId . '_etag');
+                        $item->set($response->getHeaderLine('ETag'));
+                        $cache->save($item);
                     }
                     if ($response->getHeaderLine('Last-Modified', false)) {
-                        $cache->setItem($cacheId . '_lastmodified', $response->getHeaderLine('Last-Modified'));
+                        $item = $cache->get($cacheId . '_lastmodified');
+                        $item->set($response->getHeaderLine('Last-Modified'));
+                        $cache->save($item);
                     }
                 }
             }
@@ -242,15 +248,19 @@ public function import($uri, $etag = null, $lastModified = null)
         }
         if ($cache) {
             $data = $cache->getItem($cacheId);
-            if ($data) {
-                return $this->importString($data);
+            if ($data->isHit()) {
+                return $this->importString($data->get());
             }
             $response = $client->get($uri);
             if ((int) $response->getStatusCode() !== 200) {
                 throw new Exception\RuntimeException('Feed failed to load, got response code ' . $response->getStatusCode());
             }
             $responseXml = $response->getBody();
-            $cache->setItem($cacheId, $responseXml);
+
+            $item = $cache->get($cacheId);
+            $item->set($responseXml);
+            $cache->save($item);
+
             return $this->importString($responseXml);
         }