Merge branch 'hotfix/4352' into develop

Close zendframework/zendframework#4352
zendframework · Apr 29, 2013 · 758e5c3 · 758e5c3
commit 758e5c3
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/src/Reader/Entry/Atom.php b/src/Reader/Entry/Atom.php
@@ -259,7 +259,7 @@ public function getTitle()
     /**
      * Get the number of comments/replies for current entry
      *
-     * @return integer
+     * @return int
      */
     public function getCommentCount()
     {

diff --git a/src/Reader/Entry/EntryInterface.php b/src/Reader/Entry/EntryInterface.php
@@ -102,7 +102,7 @@ public function getTitle();
     /**
      * Get the number of comments/replies for current entry
      *
-     * @return integer
+     * @return int
      */
     public function getCommentCount();
 

diff --git a/src/Reader/Extension/Atom/Entry.php b/src/Reader/Extension/Atom/Entry.php
@@ -394,7 +394,7 @@ public function getTitle()
     /**
      * Get the number of comments/replies for current entry
      *
-     * @return integer
+     * @return int
      */
     public function getCommentCount()
     {

diff --git a/src/Reader/Extension/Atom/Feed.php b/src/Reader/Extension/Atom/Feed.php
@@ -276,7 +276,7 @@ public function getImage()
         if (!$imageUrl) {
             $image = null;
         } else {
-            $image = array('uri'=>$imageUrl);
+            $image = array('uri' => $imageUrl);
         }
 
         $this->data['image'] = $image;

diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
@@ -386,7 +386,7 @@ protected function indexEntries()
             $entries = array();
             $entries = $this->xpath->evaluate('//atom:entry');
 
-            foreach ($entries as $index=>$entry) {
+            foreach ($entries as $index => $entry) {
                 $this->entries[$index] = $entry;
             }
         }

diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
@@ -683,7 +683,7 @@ protected function indexEntries()
             $entries = $this->xpath->evaluate('//rss:item');
         }
 
-        foreach ($entries as $index=>$entry) {
+        foreach ($entries as $index => $entry) {
             $this->entries[$index] = $entry;
         }
     }

diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
@@ -125,7 +125,7 @@ public function setCopyright($copyright)
     /**
      * Set the feed creation date
      *
-     * @param null|integer|DateTime
+     * @param null|int|DateTime
      * @throws Exception\InvalidArgumentException
      * @return AbstractFeed
      */
@@ -147,7 +147,7 @@ public function setDateCreated($date = null)
     /**
      * Set the feed modification date
      *
-     * @param null|integer|DateTime
+     * @param null|int|DateTime
      * @throws Exception\InvalidArgumentException
      * @return AbstractFeed
      */
@@ -169,7 +169,7 @@ public function setDateModified($date = null)
     /**
      * Set the feed last-build date. Ignored for Atom 1.0.
      *
-     * @param null|integer|DateTime
+     * @param null|int|DateTime
      * @throws Exception\InvalidArgumentException
      * @return AbstractFeed
      */

diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
@@ -177,7 +177,7 @@ public function setContent($content)
     /**
      * Set the feed creation date
      *
-     * @param null|integer|DateTime $date
+     * @param null|int|DateTime $date
      * @throws Exception\InvalidArgumentException
      * @return Entry
      */
@@ -198,7 +198,7 @@ public function setDateCreated($date = null)
     /**
      * Set the feed modification date
      *
-     * @param null|integer|DateTime $date
+     * @param null|int|DateTime $date
      * @throws Exception\InvalidArgumentException
      * @return Entry
      */
@@ -493,7 +493,7 @@ public function getTitle()
     /**
      * Get the number of comments/replies for current entry
      *
-     * @return integer
+     * @return int
      */
     public function getCommentCount()
     {

diff --git a/src/Writer/Extension/ITunes/Entry.php b/src/Writer/Extension/ITunes/Entry.php
@@ -152,7 +152,7 @@ public function setItunesDuration($value)
      */
     public function setItunesExplicit($value)
     {
-        if (!in_array($value, array('yes','no','clean'))) {
+        if (!in_array($value, array('yes', 'no', 'clean'))) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
             . ' be one of "yes", "no" or "clean"');
         }

diff --git a/src/Writer/Extension/ITunes/Feed.php b/src/Writer/Extension/ITunes/Feed.php
@@ -137,7 +137,7 @@ public function setItunesCategories(array $values)
         if (!isset($this->data['categories'])) {
             $this->data['categories'] = array();
         }
-        foreach ($values as $key=>$value) {
+        foreach ($values as $key => $value) {
             if (!is_array($value)) {
                 if ($this->stringWrapper->strlen($value) > 255) {
                     throw new Writer\Exception\InvalidArgumentException('invalid parameter: any "category" may only'
@@ -175,7 +175,7 @@ public function setItunesImage($value)
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
             . ' be a valid URI/IRI');
         }
-        if (!in_array(substr($value, -3), array('jpg','png'))) {
+        if (!in_array(substr($value, -3), array('jpg', 'png'))) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "image" may only'
             . ' use file extension "jpg" or "png" which must be the last three'
             . ' characters of the URI (i.e. no query string or fragment)');
@@ -214,7 +214,7 @@ public function setItunesDuration($value)
      */
     public function setItunesExplicit($value)
     {
-        if (!in_array($value, array('yes','no','clean'))) {
+        if (!in_array($value, array('yes', 'no', 'clean'))) {
             throw new Writer\Exception\InvalidArgumentException('invalid parameter: "explicit" may only'
             . ' be one of "yes", "no" or "clean"');
         }

diff --git a/src/Writer/Extension/ITunes/Renderer/Feed.php b/src/Writer/Extension/ITunes/Renderer/Feed.php
@@ -116,7 +116,7 @@ protected function _setCategories(DOMDocument $dom, DOMElement $root)
         if (!$cats || empty($cats)) {
             return;
         }
-        foreach ($cats as $key=>$cat) {
+        foreach ($cats as $key => $cat) {
             if (!is_array($cat)) {
                 $el = $dom->createElement('itunes:category');
                 $el->setAttribute('text', $cat);