Merge branch 'master' of git://github.com/zendframework/zf2 into feat…

…ure/console
zendframework · Jul 12, 2012 · fa03b3f · fa03b3f
2 parents 13c4023 + 189672f
commit fa03b3f
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 0 deletions.
diff --git a/src/Reader/Extension/CreativeCommons/Entry.php b/src/Reader/Extension/CreativeCommons/Entry.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Feed\Reader\Extension\CreativeCommons;
+
 use Zend\Feed\Reader;
 use Zend\Feed\Reader\Extension;
 

diff --git a/src/Reader/Extension/Podcast/Entry.php b/src/Reader/Extension/Podcast/Entry.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Feed\Reader\Extension\Podcast;
+
 use Zend\Feed\Reader\Extension;
 
 /**

diff --git a/src/Reader/Extension/Slash/Entry.php b/src/Reader/Extension/Slash/Entry.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Feed\Reader\Extension\Slash;
+
 use Zend\Feed\Reader\Extension;
 
 /**

diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Feed\Writer\Extension\ITunes;
+
 use Zend\Feed\Writer;
 use Zend\Feed\Writer\Extension;
 

diff --git a/test/Reader/Entry/CommonTest.php b/test/Reader/Entry/CommonTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Feed\Reader\Entry;
+
 use Zend\Feed\Reader\Extension;
 use Zend\Feed\Reader;
 

diff --git a/test/Reader/Feed/CommonTest.php b/test/Reader/Feed/CommonTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Feed\Reader\Feed;
+
 use Zend\Feed\Reader;
 
 /**

diff --git a/test/Reader/Integration/WordpressRss2DcAtomTest.php b/test/Reader/Integration/WordpressRss2DcAtomTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Feed\Reader\Integration;
+
 use Zend\Feed\Reader;
 
 /**

diff --git a/test/Reader/_files/My/Extension/JungleBooks/Entry.php b/test/Reader/_files/My/Extension/JungleBooks/Entry.php
@@ -9,6 +9,7 @@
  */
 
 namespace My\Extension\JungleBooks;
+
 use Zend\Feed\Reader\Extension;
 
 /**

diff --git a/test/Reader/_files/My/Extension/JungleBooks/Feed.php b/test/Reader/_files/My/Extension/JungleBooks/Feed.php
@@ -9,6 +9,7 @@
  */
 
 namespace My\Extension\JungleBooks;
+
 use Zend\Feed\Reader\Extension;
 
 /**

diff --git a/test/Writer/Extension/ITunes/EntryTest.php b/test/Writer/Extension/ITunes/EntryTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Feed\Writer\Extension\ITunes;
+
 use Zend\Feed\Writer;
 
 /**

diff --git a/test/Writer/Extension/ITunes/FeedTest.php b/test/Writer/Extension/ITunes/FeedTest.php
@@ -9,6 +9,7 @@
  */
 
 namespace ZendTest\Feed\Writer\Extension\ITunes;
+
 use Zend\Feed\Writer;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
      */
     namespace Zend\Feed\Reader\Extension\CreativeCommons;
     use Zend\Feed\Reader;
     use Zend\Feed\Reader\Extension;
@@ Expand Down @@