Author: as
Date: Tue Nov 13 15:15:06 2007
New Revision: 6721
Log:
- Added support for 'logo' ATOM feed element (handled as 'image' through
ezcFeed).
Added:
trunk/Feed/tests/atom/regression/generate/optional/logo/
trunk/Feed/tests/atom/regression/generate/optional/logo/logo.in
trunk/Feed/tests/atom/regression/generate/optional/logo/logo.out
trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.in
trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.out
trunk/Feed/tests/atom/regression/parse/optional/logo/
trunk/Feed/tests/atom/regression/parse/optional/logo/logo.in
trunk/Feed/tests/atom/regression/parse/optional/logo/logo.out
trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.in
trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
Modified:
trunk/Feed/src/feed.php
trunk/Feed/src/processors/atom.php
Modified: trunk/Feed/src/feed.php
==============================================================================
--- trunk/Feed/src/feed.php [iso-8859-1] (original)
+++ trunk/Feed/src/feed.php [iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -185,7 +185,7 @@
case 'generator':
case 'ttl':
case 'id': // ATOM only, required in ATOM
- case 'image': // icon in ATOM
+ case 'image': // logo in ATOM
case 'docs':
case 'skipHours': // optional in RSS2
case 'skipDays': // optional in RSS2
@@ -231,7 +231,7 @@
case 'id': // ATOM only, required in ATOM
case 'item':
case 'items':
- case 'image': // icon in ATOM
+ case 'image': // logo in ATOM
case 'docs':
case 'skipHours': // optional in RSS2
case 'skipDays': // optional in RSS2
Modified: trunk/Feed/src/processors/atom.php
==============================================================================
--- trunk/Feed/src/processors/atom.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/atom.php [iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -328,6 +328,7 @@
case 'id':
case 'generator':
+ case 'image':
$feed->$tagName = $channelChild->textContent;
break;
Added: trunk/Feed/tests/atom/regression/generate/optional/logo/logo.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/logo/logo.in (added)
+++ trunk/Feed/tests/atom/regression/generate/optional/logo/logo.in
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'image' => 'Feed logo' );
+?>
Added: trunk/Feed/tests/atom/regression/generate/optional/logo/logo.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/logo/logo.out (added)
+++ trunk/Feed/tests/atom/regression/generate/optional/logo/logo.out
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <logo>Feed logo</logo>
+</feed>
Added: trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.in
(added)
+++ trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.in
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'image' => null );
+?>
Added: trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.out
(added)
+++ trunk/Feed/tests/atom/regression/generate/optional/logo/logo_empty.out
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <logo></logo>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/logo/logo.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/logo/logo.in (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/logo/logo.in [iso-8859-1]
Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <logo>Feed logo</logo>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/logo/logo.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/logo/logo.out (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/logo/logo.out [iso-8859-1]
Tue Nov 13 15:15:06 2007
@@ -1,0 +1,12 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->image = 'Feed logo';
+
+return $feed;
+?>
Added: trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.in (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.in
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom";>
+ <id>Feed id</id>
+ <title type="text">Feed title</title>
+ <updated>Feed updated</updated>
+ <logo/>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/logo/logo_empty.out
[iso-8859-1] Tue Nov 13 15:15:06 2007
@@ -1,0 +1,12 @@
+<?php
+$feed = new ezcFeed( 'atom' );
+
+$feed->id = 'Feed id';
+$feed->title = 'Feed title';
+$feed->title->type = 'text';
+$feed->updated = 'Feed updated';
+
+$feed->image = null;
+
+return $feed;
+?>
--
svn-components mailing list
[EMAIL PROTECTED]
http://lists.ez.no/mailman/listinfo/svn-components
