Merge branch 'hotfix/feed-version-dependency-removal'

Close zendframework/zendframework#4392
zendframework · May 6, 2013 · 6056c93 · 6056c93
commit 6056c93
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -17,8 +17,7 @@
         "zendframework/zend-escaper": "self.version",
         "zendframework/zend-stdlib": "self.version",
         "zendframework/zend-servicemanager": "self.version",
-        "zendframework/zend-uri": "self.version",
-        "zendframework/zend-version": "self.version"
+        "zendframework/zend-uri": "self.version"
     },
     "require-dev": {
         "zendframework/zend-db": "self.version",

diff --git a/src/PubSubHubbub/Publisher.php b/src/PubSubHubbub/Publisher.php
@@ -13,7 +13,6 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Uri;
-use Zend\Version\Version;
 
 class Publisher
 {

diff --git a/src/PubSubHubbub/Subscriber.php b/src/PubSubHubbub/Subscriber.php
@@ -15,7 +15,6 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Stdlib\ArrayUtils;
 use Zend\Uri;
-use Zend\Version\Version;
 
 class Subscriber
 {

diff --git a/src/PubSubHubbub/Version.php b/src/PubSubHubbub/Version.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\PubSubHubbub;
+
+abstract class Version
+{
+    const VERSION = '2';
+}
diff --git a/src/Writer/Renderer/Feed/AbstractAtom.php b/src/Writer/Renderer/Feed/AbstractAtom.php
@@ -14,7 +14,7 @@
 use DOMElement;
 use Zend\Feed\Writer;
 use Zend\Feed\Writer\Renderer;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
 
 /**
 */

diff --git a/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
@@ -13,7 +13,7 @@
 use DOMDocument;
 use DOMElement;
 use Zend\Feed;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
 
 class AbstractAtom extends Feed\Writer\Renderer\AbstractRenderer
 {

diff --git a/src/Writer/Renderer/Feed/Rss.php b/src/Writer/Renderer/Feed/Rss.php
@@ -14,8 +14,8 @@
 use DOMElement;
 use Zend\Feed\Writer;
 use Zend\Feed\Writer\Renderer;
+use Zend\Feed\Writer\Version;
 use Zend\Uri;
-use Zend\Version\Version;
 
 /**
 */

diff --git a/src/Writer/Version.php b/src/Writer/Version.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Feed\Writer;
+
+abstract class Version
+{
+    const VERSION = '2';
+}
diff --git a/test/Writer/FeedTest.php b/test/Writer/FeedTest.php
@@ -13,7 +13,7 @@
 use DateTime;
 use Zend\Feed\Writer;
 use Zend\Feed\Writer\Feed;
-use Zend\Version\Version;
+use Zend\Feed\Writer\Version;
 
 /**
  * @category   Zend

diff --git a/test/Writer/Renderer/Feed/RssTest.php b/test/Writer/Renderer/Feed/RssTest.php
@@ -13,6 +13,7 @@
 use DateTime;
 use Zend\Feed\Writer;
 use Zend\Feed\Writer\Renderer;
+use Zend\Feed\Writer\Version;
 use Zend\Feed\Reader;
 
 /**
@@ -179,7 +180,7 @@ public function testFeedGeneratorDefaultIsUsedIfGeneratorNotSetByHand()
         $rssFeed->render();
         $feed = Reader\Reader::importString($rssFeed->saveXml());
         $this->assertEquals(
-            'Zend_Feed_Writer ' . \Zend\Version\Version::VERSION . ' (http://framework.zend.com)', $feed->getGenerator());
+            'Zend_Feed_Writer ' . Version::VERSION . ' (http://framework.zend.com)', $feed->getGenerator());
     }
 
     public function testFeedLanguageHasBeenSet()