Merge pull request zendframework/zendframework#1 from zendframework/d…

…evelop

Develop

src/Reader/Reader.php

@@ -17,7 +17,7 @@
 
 /**
 */
-class Reader
+class Reader implements ReaderImportInterface
 {
     /**
      * Namespace constants
@@ -544,7 +544,7 @@ public static function setExtensionManager(ExtensionManagerInterface $extensionM
     public static function getExtensionManager()
     {
         if (!isset(static::$extensionManager)) {
-            static::setExtensionManager(new ExtensionManager());
+            static::setExtensionManager(new StandaloneExtensionManager());
         }
         return static::$extensionManager;
     }

src/Reader/ReaderImportInterface.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader;
+
+interface ReaderImportInterface
+{
+    /**
+     * Import a feed by providing a URI
+     *
+     * @param  string $uri The URI to the feed
+     * @param  string $etag OPTIONAL Last received ETag for this resource
+     * @param  string $lastModified OPTIONAL Last-Modified value for this resource
+     * @return Feed\FeedInterface
+     * @throws Exception\RuntimeException
+     */
+    public static function import($uri, $etag = null, $lastModified = null);
+
+    /**
+     * Import a feed from a remote URI
+     *
+     * Performs similarly to import(), except it uses the HTTP client passed to
+     * the method, and does not take into account cached data.
+     *
+     * Primary purpose is to make it possible to use the Reader with alternate
+     * HTTP client implementations.
+     *
+     * @param  string $uri
+     * @param  Http\ClientInterface $client
+     * @return self
+     * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
+     */
+    public static function importRemoteFeed($uri, Http\ClientInterface $client);
+
+
+    /**
+     * Import a feed from a string
+     *
+     * @param  string $string
+     * @return Feed\FeedInterface
+     * @throws Exception\InvalidArgumentException
+     * @throws Exception\RuntimeException
+     */
+    public static function importString($string);
+
+
+    /**
+     * Imports a feed from a file located at $filename.
+     *
+     * @param  string $filename
+     * @throws Exception\RuntimeException
+     * @return Feed\FeedInterface
+     */
+    public static function importFile($filename);
+}

src/Reader/StandaloneExtensionManager.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Reader;
+
+class StandaloneExtensionManager implements ExtensionManagerInterface
+{
+    private $extensions = array(
+        'Atom\Entry'            => 'Zend\Feed\Reader\Extension\Atom\Entry',
+        'Atom\Feed'             => 'Zend\Feed\Reader\Extension\Atom\Feed',
+        'Content\Entry'         => 'Zend\Feed\Reader\Extension\Content\Entry',
+        'CreativeCommons\Entry' => 'Zend\Feed\Reader\Extension\CreativeCommons\Entry',
+        'CreativeCommons\Feed'  => 'Zend\Feed\Reader\Extension\CreativeCommons\Feed',
+        'DublinCore\Entry'      => 'Zend\Feed\Reader\Extension\DublinCore\Entry',
+        'DublinCore\Feed'       => 'Zend\Feed\Reader\Extension\DublinCore\Feed',
+        'Podcast\Entry'         => 'Zend\Feed\Reader\Extension\Podcast\Entry',
+        'Podcast\Feed'          => 'Zend\Feed\Reader\Extension\Podcast\Feed',
+        'Slash\Entry'           => 'Zend\Feed\Reader\Extension\Slash\Entry',
+        'Syndication\Feed'      => 'Zend\Feed\Reader\Extension\Syndication\Feed',
+        'Thread\Entry'          => 'Zend\Feed\Reader\Extension\Thread\Entry',
+        'WellFormedWeb\Entry'   => 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry',
+    );
+
+    /**
+     * Do we have the extension?
+     *
+     * @param  string $extension
+     * @return bool
+     */
+    public function has($extension)
+    {
+        return array_key_exists($extension, $this->extensions);
+    }
+
+    /**
+     * Retrieve the extension
+     *
+     * @param  string $extension
+     * @return Extension\AbstractEntry|Extension\AbstractFeed
+     */
+    public function get($extension)
+    {
+        $class = $this->extensions[$extension];
+        return new $class();
+    }
+}

test/Reader/ReaderTest.php

@@ -255,9 +255,10 @@ public function testRegistersUserExtension()
     {
         require_once __DIR__ . '/_files/My/Extension/JungleBooks/Entry.php';
         require_once __DIR__ . '/_files/My/Extension/JungleBooks/Feed.php';
-        $manager = Reader\Reader::getExtensionManager();
+        $manager = new Reader\ExtensionManager(new Reader\ExtensionPluginManager());
         $manager->setInvokableClass('JungleBooks\Entry', 'My\Extension\JungleBooks\Entry');
         $manager->setInvokableClass('JungleBooks\Feed', 'My\Extension\JungleBooks\Feed');
+        Reader\Reader::setExtensionManager($manager);
         Reader\Reader::registerExtension('JungleBooks');
 
         $this->assertTrue(Reader\Reader::isRegistered('JungleBooks'));
@@ -331,7 +332,7 @@ protected function _getTempDirectory()
                 return $dir;
             }
         }
-        $tempFile = tempnam(md5(uniqid(rand(), TRUE)), '');
+        $tempFile = tempnam(md5(uniqid(rand(), true)), '');
         if ($tempFile) {
             $dir = realpath(dirname($tempFile));
             unlink($tempFile);

test/Reader/StandaloneExtensionManagerTest.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+namespace ZendTest\Feed\Reader;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Feed\Reader\StandaloneExtensionManager;
+
+class StandaloneExtensionManagerTest extends TestCase
+{
+    public function setUp()
+    {
+        $this->extensions = new StandaloneExtensionManager();
+    }
+
+    public function testIsAnExtensionManagerImplementation()
+    {
+        $this->assertInstanceOf('Zend\Feed\Reader\ExtensionManagerInterface', $this->extensions);
+    }
+
+    public function defaultPlugins()
+    {
+        return array(
+            'Atom\Entry'            => array('Atom\Entry', 'Zend\Feed\Reader\Extension\Atom\Entry'),
+            'Atom\Feed'             => array('Atom\Feed', 'Zend\Feed\Reader\Extension\Atom\Feed'),
+            'Content\Entry'         => array('Content\Entry', 'Zend\Feed\Reader\Extension\Content\Entry'),
+            'CreativeCommons\Entry' => array(
+                'CreativeCommons\Entry',
+                'Zend\Feed\Reader\Extension\CreativeCommons\Entry'
+            ),
+            'CreativeCommons\Feed'  => array('CreativeCommons\Feed', 'Zend\Feed\Reader\Extension\CreativeCommons\Feed'),
+            'DublinCore\Entry'      => array('DublinCore\Entry', 'Zend\Feed\Reader\Extension\DublinCore\Entry'),
+            'DublinCore\Feed'       => array('DublinCore\Feed', 'Zend\Feed\Reader\Extension\DublinCore\Feed'),
+            'Podcast\Entry'         => array('Podcast\Entry', 'Zend\Feed\Reader\Extension\Podcast\Entry'),
+            'Podcast\Feed'          => array('Podcast\Feed', 'Zend\Feed\Reader\Extension\Podcast\Feed'),
+            'Slash\Entry'           => array('Slash\Entry', 'Zend\Feed\Reader\Extension\Slash\Entry'),
+            'Syndication\Feed'      => array('Syndication\Feed', 'Zend\Feed\Reader\Extension\Syndication\Feed'),
+            'Thread\Entry'          => array('Thread\Entry', 'Zend\Feed\Reader\Extension\Thread\Entry'),
+            'WellFormedWeb\Entry'   => array('WellFormedWeb\Entry', 'Zend\Feed\Reader\Extension\WellFormedWeb\Entry'),
+        );
+    }
+
+    /**
+     * @dataProvider defaultPlugins
+     */
+    public function testHasAllDefaultPlugins($pluginName, $pluginClass)
+    {
+        $this->assertTrue($this->extensions->has($pluginName));
+    }
+
+    /**
+     * @dataProvider defaultPlugins
+     */
+    public function testCanRetrieveDefaultPluginInstances($pluginName, $pluginClass)
+    {
+        $extension = $this->extensions->get($pluginName);
+        $this->assertInstanceOf($pluginClass, $extension);
+    }
+
+    /**
+     * @dataProvider defaultPlugins
+     */
+    public function testEachPluginRetrievalReturnsNewInstance($pluginName, $pluginClass)
+    {
+        $extension = $this->extensions->get($pluginName);
+        $this->assertInstanceOf($pluginClass, $extension);
+
+        $test = $this->extensions->get($pluginName);
+        $this->assertInstanceOf($pluginClass, $test);
+        $this->assertNotSame($extension, $test);
+    }
+}