Assertation fixes, build file update, remove last trace of CDF #5

Merged
merged 5 commits into from Dec 17, 2011
View
8 XML/Feed/Parser/Atom.php
@@ -193,6 +193,14 @@ protected function getPerson($method, $arguments)
if ($param->length == 0) {
return false;
}
+
+ $email = $section->item($offset)->getElementsByTagName('email');
+ if ($email->length > 0 && $parameter == 'name') {
+ $email_sanitized = $this->sanitizer->sanitize($email->item(0)->nodeValue);
+ $person_sanitized = $this->sanitizer->sanitize($param->item(0)->nodeValue);
+ return $person_sanitized . ' (' . $email_sanitized . ')';
+ }
+
return $this->sanitizer->sanitize($param->item(0)->nodeValue);
}
View
5 package.xml
@@ -1679,6 +1679,11 @@ Bug #15365
<extension>
<name>xml</name>
</extension>
+ <package>
+ <name>Log</name>
+ <channel>pear.php.net</channel>
+ <min>1.7</min>
+ </package>
</required>
<optional>
<extension>
View
3 tests/atomValues.php
@@ -118,7 +118,8 @@ function test_entryAuthorURL()
function test_entryAuthorName()
{
- $value = 'Mark Pilgrim';
+ $value = 'Mark Pilgrim (f8dy@example.com)
+';
$this->assertEquals($value, $this->entry->author);
}
View
8 tests/convertedtests/base.php
@@ -12,14 +12,6 @@ function setUp() {
parent::setUp();
}
- function test_cdf_item_abstract_xml_base_1() {
- $content = file_get_contents($this->fp_test_dir . DIRECTORY_SEPARATOR . 'wellformed/base/cdf_item_abstract_xml_base.xml');
-
- $feed = new XML_Feed_Parser($content, true, true);
-
- $this->assertEquals('http://base.example.org/', $feed->getEntryByOffset(0)->summary(0, 'base'));
- }
-
function test_entry_content_xml_base_1() {
$content = file_get_contents($this->fp_test_dir . DIRECTORY_SEPARATOR . 'wellformed/base/entry_content_xml_base.xml');