Merge branch 'feed/doc-fix' of https://github.com/bakura10/zf2 into h…

…otfix/feed-docblocks

Conflicts:
	library/Zend/Form/Element/Collection.php

src/Reader/Reader.php

@@ -446,7 +446,6 @@ public static function detectType($feed, $specOnly = false)
             }
         }
 
-        $type = self::TYPE_ATOM_ANY;
         $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_10);
 
         if ($xpath->query('//atom:feed')->length) {

src/Writer/Deleted.php

@@ -38,8 +38,9 @@ class Deleted
     /**
      * Set the feed character encoding
      *
-     * @return string|null
+     * @param  $encoding
      * @throws Exception\InvalidArgumentException
+     * @return string|null
      */
     public function setEncoding($encoding)
     {

src/Writer/Feed.php

@@ -41,7 +41,7 @@ class Feed extends AbstractFeed implements Iterator, Countable
      * added to the current feed automatically, but is necessary to create a
      * container with some initial values preset based on the current feed data.
      *
-     * @return Zend_Feed_Writer_Entry
+     * @return \Zend\Feed\Writer\Entry
      */
     public function createEntry()
     {
@@ -54,10 +54,11 @@ public function createEntry()
     }
 
     /**
-     * Appends a Zend_Feed_Writer_Deleted object representing a new entry tombstone
+     * Appends a Zend\Feed\Writer\Deleted object representing a new entry tombstone
      * to the feed data container's internal group of entries.
      *
-     * @param Zend_Feed_Writer_Deleted $entry
+     * @param Deleted $deleted
+     * @return void
      */
     public function addTombstone(Deleted $deleted)
     {
@@ -69,7 +70,7 @@ public function addTombstone(Deleted $deleted)
      * added to the current feed automatically, but is necessary to create a
      * container with some initial values preset based on the current feed data.
      *
-     * @return Zend_Feed_Writer_Deleted
+     * @return Deleted
      */
     public function createTombstone()
     {
@@ -82,10 +83,10 @@ public function createTombstone()
     }
 
     /**
-     * Appends a Zend_Feed_Writer_Entry object representing a new entry/item
+     * Appends a Zend\Feed\Writer\Entry object representing a new entry/item
      * the feed data container's internal group of entries.
      *
-     * @param Zend_Feed_Writer_Entry $entry
+     * @param Entry $entry
      */
     public function addEntry(Entry $entry)
     {
@@ -164,7 +165,7 @@ public function count()
     /**
      * Return the current entry
      *
-     * @return Zend_Feed_Reader_Entry_Interface
+     * @return Entry
      */
     public function current()
     {
@@ -174,7 +175,7 @@ public function current()
     /**
      * Return the current feed key
      *
-     * @return unknown
+     * @return mixed
      */
     public function key()
     {
@@ -214,9 +215,10 @@ public function valid()
     /**
      * Attempt to build and return the feed resulting from the data set
      *
-     * @param $type The feed type "rss" or "atom" to export as
-     * @return string
+     * @param  string  $type The feed type "rss" or "atom" to export as
+     * @param  bool    $ignoreExceptions
      * @throws Exception\InvalidArgumentException
+     * @return string
      */
     public function export($type, $ignoreExceptions = false)
     {