Zend_Feed_Reader: Updated Atom Source support to correctly detect a source element in an Atom entry

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@19286 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Feed/Reader/Extension/Atom/Entry.php

@@ -521,19 +521,17 @@ class Zend_Feed_Reader_Extension_Atom_Entry
         if (array_key_exists('source', $this->_data)) {
             return $this->_data['source'];
         }
-
-        if ($this->_getAtomType() == Zend_Feed_Reader::TYPE_ATOM_10) {
-            $source = $this->_xpath->query($this->getXpathPrefix() . '/atom:source[1]');
-        } else {
-            $source = null;
-        }
         
-        if ($source) {
-            $source = new Zend_Feed_Reader_Feed_Atom_Source($source, $this->getXpathPrefix());
+        $source = null;
+        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) {
+            $list = $this->_xpath->query($this->getXpathPrefix() . '/atom:source[1]');
+            if ($list->length) {
+                $element = $list->item(0);
+                $source = new Zend_Feed_Reader_Feed_Atom_Source($element, $this->getXpathPrefix());
+            }
         }
-
+        
         $this->_data['source'] = $source;
-
         return $this->_data['source']; 
     }
 

tests/Zend/Feed/Reader/Feed/AtomSourceTest.php

@@ -22,7 +22,6 @@
 
 require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Feed/Reader.php';
-require_once 'Zend/Feed/Reader/FeedAbstract.php';
 
 /**
  * @category   Zend