Pārlūkot izejas kodu

Fixed typo (and added missing test!) preventing feed type detection on strings - fixes ZF-9723

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22031 44c647ce-9c0f-0410-b52a-842ac1e357ba
padraic 15 gadi atpakaļ
vecāks
revīzija
c3ed945294
2 mainītis faili ar 11 papildinājumiem un 1 dzēšanām
  1. 1 1
      library/Zend/Feed/Reader.php
  2. 10 0
      tests/Zend/Feed/ReaderTest.php

+ 1 - 1
library/Zend/Feed/Reader.php

@@ -427,7 +427,7 @@ class Zend_Feed_Reader
         } elseif(is_string($feed) && !empty($feed)) {
             @ini_set('track_errors', 1);
             $dom = new DOMDocument;
-            $status = @$doc->loadXML($string);
+            $status = @$dom->loadXML($feed);
             @ini_restore('track_errors');
             if (!$status) {
                 if (!isset($php_errormsg)) {

+ 10 - 0
tests/Zend/Feed/ReaderTest.php

@@ -120,6 +120,16 @@ class Zend_Feed_ReaderTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(Zend_Feed_Reader::TYPE_ATOM_03, $type);
     }
 
+    /**
+     * @group ZF-9723
+     */
+    public function testDetectsTypeFromStringOrToRemindPaddyAboutForgettingATestWhichLetsAStupidTypoSurviveUnnoticedForMonths()
+    {
+        $feed = '<?xml version="1.0" encoding="utf-8" ?><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"><channel></channel></rdf:RDF>';
+        $type = Zend_Feed_Reader::detectType($feed);
+        $this->assertEquals(Zend_Feed_Reader::TYPE_RSS_10, $type);
+    }
+
     public function testGetEncoding()
     {
         $feed = Zend_Feed_Reader::importString(