Merge branch 'cs/zendframework/zendframework#6969-dead-code-removal' …

…into develop Close zendframework/zendframework#6969
zendframework · Dec 8, 2014 · 5b35f97 · 5b35f97
3 parents 1ec739e + 929f993 + eb10eaf
commit 5b35f97
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 24 deletions.
diff --git a/src/Reader/Entry/Rss.php b/src/Reader/Entry/Rss.php
@@ -109,8 +109,6 @@ public function getAuthors()
         if ($list->length) {
             foreach ($list as $author) {
                 $string = trim($author->nodeValue);
-                $email = null;
-                $name = null;
                 $data = array();
                 // Pretty rough parsing - but it's a catchall
                 if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
@@ -188,7 +186,6 @@ public function getDateModified()
             return $this->data['datemodified'];
         }
 
-        $dateModified = null;
         $date = null;
 
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10

diff --git a/src/Reader/Extension/DublinCore/Entry.php b/src/Reader/Extension/DublinCore/Entry.php
@@ -131,7 +131,6 @@ public function getDescription()
             return $this->data['description'];
         }
 
-        $description = null;
         $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
 
         if (!$description) {
@@ -158,7 +157,6 @@ public function getId()
             return $this->data['id'];
         }
 
-        $id = null;
         $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
 
         if (!$id) {
@@ -181,7 +179,6 @@ public function getTitle()
             return $this->data['title'];
         }
 
-        $title = null;
         $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
 
         if (!$title) {

diff --git a/src/Reader/Extension/DublinCore/Feed.php b/src/Reader/Extension/DublinCore/Feed.php
@@ -87,7 +87,6 @@ public function getCopyright()
             return $this->data['copyright'];
         }
 
-        $copyright = null;
         $copyright = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:rights)');
 
         if (!$copyright) {
@@ -114,7 +113,6 @@ public function getDescription()
             return $this->data['description'];
         }
 
-        $description = null;
         $description = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:description)');
 
         if (!$description) {
@@ -141,7 +139,6 @@ public function getId()
             return $this->data['id'];
         }
 
-        $id = null;
         $id = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:identifier)');
 
         if (!$id) {
@@ -164,7 +161,6 @@ public function getLanguage()
             return $this->data['language'];
         }
 
-        $language = null;
         $language = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:language)');
 
         if (!$language) {
@@ -191,7 +187,6 @@ public function getTitle()
             return $this->data['title'];
         }
 
-        $title = null;
         $title = $this->getXpath()->evaluate('string(' . $this->getXpathPrefix() . '/dc11:title)');
 
         if (!$title) {

diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
@@ -106,8 +106,6 @@ public function getAuthors()
         if ($list->length) {
             foreach ($list as $author) {
                 $string = trim($author->nodeValue);
-                $email = null;
-                $name = null;
                 $data = array();
                 // Pretty rough parsing - but it's a catchall
                 if (preg_match("/^.*@[^ ]*/", $string, $matches)) {
@@ -194,7 +192,6 @@ public function getDateModified()
             return $this->data['datemodified'];
         }
 
-        $dateModified = null;
         $date = null;
 
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
@@ -258,7 +255,6 @@ public function getLastBuildDate()
             return $this->data['lastBuildDate'];
         }
 
-        $lastBuildDate = null;
         $date = null;
 
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
@@ -310,8 +306,6 @@ public function getDescription()
             return $this->data['description'];
         }
 
-        $description = null;
-
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
             $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $description = $this->xpath->evaluate('string(/rss/channel/description)');
@@ -481,8 +475,6 @@ public function getLink()
             return $this->data['link'];
         }
 
-        $link = null;
-
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
             $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $link = $this->xpath->evaluate('string(/rss/channel/link)');
@@ -514,8 +506,6 @@ public function getFeedLink()
             return $this->data['feedlink'];
         }
 
-        $link = null;
-
         $link = $this->getExtension('Atom')->getFeedLink();
 
         if ($link === null || empty($link)) {
@@ -578,8 +568,6 @@ public function getTitle()
             return $this->data['title'];
         }
 
-        $title = null;
-
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 &&
             $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $title = $this->xpath->evaluate('string(/rss/channel/title)');

diff --git a/src/Reader/Reader.php b/src/Reader/Reader.php
@@ -190,7 +190,6 @@ public static function useHttpConditionalGet($bool = true)
     public static function import($uri, $etag = null, $lastModified = null)
     {
         $cache       = self::getCache();
-        $feed        = null;
         $client      = self::getHttpClient();
         $client->resetParameters();
         $headers = new ZendHttp\Headers();