Merge branch 'hotfix/zendframework/zendframework#6093-dead-code-clean…

…ups' Close zendframework/zendframework#6093
zendframework · Apr 8, 2014 · ec7ea9f · ec7ea9f
2 parents 18ac29e + e095fa4
commit ec7ea9f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 7 deletions.
diff --git a/src/Reader/Feed/Atom.php b/src/Reader/Feed/Atom.php
@@ -383,7 +383,6 @@ protected function indexEntries()
     {
         if ($this->getType() == Reader\Reader::TYPE_ATOM_10 ||
             $this->getType() == Reader\Reader::TYPE_ATOM_03) {
-            $entries = array();
             $entries = $this->xpath->evaluate('//atom:entry');
 
             foreach ($entries as $index => $entry) {

diff --git a/src/Reader/Feed/Rss.php b/src/Reader/Feed/Rss.php
@@ -675,8 +675,6 @@ public function getCategories()
      */
     protected function indexEntries()
     {
-        $entries = array();
-
         if ($this->getType() !== Reader\Reader::TYPE_RSS_10 && $this->getType() !== Reader\Reader::TYPE_RSS_090) {
             $entries = $this->xpath->evaluate('//item');
         } else {

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

diff --git a/src/Writer/AbstractFeed.php b/src/Writer/AbstractFeed.php
@@ -287,7 +287,6 @@ protected function _validateTagUri($id)
     {
         if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
             $dvalid = false;
-            $nvalid = false;
             $date = $matches['date'];
             $d6 = strtotime($date);
             if ((strlen($date) == 4) && $date <= date('Y')) {

diff --git a/src/Writer/Renderer/Entry/Atom.php b/src/Writer/Renderer/Entry/Atom.php
@@ -291,7 +291,6 @@ protected function _validateTagUri($id)
     {
         if (preg_match('/^tag:(?P<name>.*),(?P<date>\d{4}-?\d{0,2}-?\d{0,2}):(?P<specific>.*)(.*:)*$/', $id, $matches)) {
             $dvalid = false;
-            $nvalid = false;
             $date = $matches['date'];
             $d6 = strtotime($date);
             if ((strlen($date) == 4) && $date <= date('Y')) {
@@ -353,7 +352,6 @@ protected function _setContent(DOMDocument $dom, DOMElement $root)
      */
     protected function _loadXhtml($content)
     {
-        $xhtml = '';
         if (class_exists('tidy', false)) {
             $tidy = new \tidy;
             $config = array(