Zend_Feed_Reader: Fixed trailing forward slash added to Atom 1.0 source elements XPATH query prefix

All tests are now back to a passing state.


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

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

@@ -481,7 +481,7 @@ class Zend_Feed_Reader_Extension_Atom_Entry
             return $this->_data['categories'];
         }
 
-        if ($this->_getAtomType() == Zend_Feed_Reader::TYPE_ATOM_10) {
+        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) {
             $list = $this->_xpath->query($this->getXpathPrefix() . '//atom:category');
         } else {
             /**

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

@@ -379,6 +379,7 @@ class Zend_Feed_Reader_Extension_Atom_Feed
             return $this->_data['hubs'];
         }
         $hubs = array();
+        
         $list = $this->_xpath->query($this->getXpathPrefix()
             . '//atom:link[@rel="hub"]/@href');
 
@@ -428,7 +429,7 @@ class Zend_Feed_Reader_Extension_Atom_Feed
             return $this->_data['categories'];
         }
 
-        if ($this->_getAtomType() == Zend_Feed_Reader::TYPE_ATOM_10) {
+        if ($this->getType() == Zend_Feed_Reader::TYPE_ATOM_10) {
             $list = $this->_xpath->query($this->getXpathPrefix() . '//atom:category');
         } else {
             /**

library/Zend/Feed/Reader/Feed/Atom/Source.php

@@ -55,7 +55,7 @@ class Zend_Feed_Reader_Feed_Atom_Source extends Zend_Feed_Reader_Feed_Atom
         $atomClass = Zend_Feed_Reader::getPluginLoader()->getClassName('DublinCore_Feed');
         $this->_extensions['DublinCore_Feed'] = new $atomClass($this->_domDocument, $this->_data['type'], $this->_xpath);
         foreach ($this->_extensions as $extension) {
-            $extension->setXpathPrefix(rtrim($xpathPrefix, '/') . '/atom:source/');
+            $extension->setXpathPrefix(rtrim($xpathPrefix, '/') . '/atom:source');
         }
     }
     

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

@@ -277,7 +277,6 @@ class Zend_Feed_Reader_Feed_AtomSourceTest extends PHPUnit_Framework_TestCase
     /**
      * Get Pubsubhubbub Hubs
      */
-
     public function testGetsHubsFromAtom10()
     {
         $feed = Zend_Feed_Reader::importString(
@@ -293,7 +292,6 @@ class Zend_Feed_Reader_Feed_AtomSourceTest extends PHPUnit_Framework_TestCase
     /**
      * Get category data
      */
-    
     public function testGetsCategoriesFromAtom10()
     {
         $feed = Zend_Feed_Reader::importString(