Bug19 mirgration static to dynamic

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",

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,19 +71,30 @@ 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;
         if ($type !== null) {
             $this->data['type'] = $type;
         } else {
-            $this->data['type'] = Reader::detectType($entry);
+            $this->data['type'] = $this->getReader()->detectType($entry);
         }
         $this->_loadExtensions();
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Get the DOM
      *
@@ -209,13 +227,13 @@ public function __call($method, $args)
      */
     protected function _loadExtensions()
     {
-        $all = 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']
             );

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,14 +289,15 @@ public function getExtension($name)
 
     protected function loadExtensions()
     {
-        $all     = Reader::getExtensions();
-        $manager = Reader::getExtensionManager();
+        $all     = $this->getReader()->getExtensions();
+        $manager = $this->getReader()->getExtensionManager();
         $feed    = $all['feed'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
                 continue;
             }
             $plugin = $manager->get($extension);
+            $plugin->setReader($this->getReader());
             $plugin->setDomDocument($this->getDomDocument());
             $plugin->setType($this->data['type']);
             $plugin->setXpath($this->xpath);

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,21 +73,32 @@ 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;
         if ($type !== null) {
             $this->data['type'] = $type;
         } elseif ($this->domDocument !== null) {
-            $this->data['type'] = Reader\Reader::detectType($this->domDocument);
+            $this->data['type'] = $this->getReader()->detectType($this->domDocument);
         } else {
             $this->data['type'] = Reader\Reader::TYPE_ANY;
         }
         $this->loadExtensions();
     }
 
+    /**
+     * Get Feed Reader
+     *
+     * @return Reader\Reader
+     */
+    public function getReader()
+    {
+        return $this->reader;
+    }
+
     /**
      * Get the DOM
      *
@@ -216,14 +234,16 @@ public function __call($method, $args)
      */
     protected function loadExtensions()
     {
-        $all     = Reader\Reader::getExtensions();
-        $manager = Reader\Reader::getExtensionManager();
+        $all     = $this->getReader()->getExtensions();
+        $manager = $this->getReader()->getExtensionManager();
+
         $feed    = $all['entry'];
         foreach ($feed as $extension) {
             if (in_array($extension, $all['core'])) {
                 continue;
             }
             $plugin = $manager->get($extension);
+            $plugin->setReader($this->getReader());
             $plugin->setEntryElement($this->getElement());
             $plugin->setEntryKey($this->entryKey);
             $plugin->setType($this->data['type']);

src/Reader/Entry/Atom.php

@@ -29,18 +29,19 @@ 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) . ']';
 
-        $manager    = 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);

src/Reader/Entry/Rss.php

@@ -38,13 +38,13 @@ 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) . ']';
 
-        $manager    = Reader\Reader::getExtensionManager();
+        $manager    = $this->getReader()->getExtensionManager();
         $extensions = [
             'DublinCore\Entry',
             'Content\Entry',
@@ -55,6 +55,7 @@ public function __construct(DOMElement $entry, $entryKey, $type = null)
         ];
         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(
-                Reader\Reader::arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 

src/Reader/Extension/AbstractEntry.php

@@ -58,6 +58,33 @@ abstract class AbstractEntry
      */
     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 entry DOMElement
      *
@@ -159,7 +186,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if ($type === null) {
-            $type = Reader\Reader::detectType($this->getEntryElement(), true);
+            $type = $this->getReader()->detectType($this->getEntryElement(), true);
             $this->setType($type);
         }
 

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
      *
@@ -99,7 +126,7 @@ public function getType()
     {
         $type = $this->data['type'];
         if (null === $type) {
-            $type = Reader\Reader::detectType($this->getDomDocument());
+            $type = $this->getReader()->detectType($this->getDomDocument());
             $this->setType($type);
         }
         return $type;

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)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 
@@ -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());
             }
         }
 

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)
+                $this->getReader()->arrayUnique($authors)
             );
         }
 

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;
 
@@ -65,7 +64,7 @@ public function getAuthors()
                 ];
             }
             $authors = new Collection\Author(
-                Reader\Reader::arrayUnique($authors)
+                $this->getReader()->arrayUnique($authors)
             );
         } else {
             $authors = null;