Author: as
Date: Tue Nov 13 15:50:21 2007
New Revision: 6722
Log:
- Added support for 'icon' ATOM feed element.
Added:
trunk/Feed/tests/atom/regression/generate/optional/icon/
trunk/Feed/tests/atom/regression/generate/optional/icon/icon.in
trunk/Feed/tests/atom/regression/generate/optional/icon/icon.out
trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.in
trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.out
trunk/Feed/tests/atom/regression/parse/optional/icon/
trunk/Feed/tests/atom/regression/parse/optional/icon/icon.in
trunk/Feed/tests/atom/regression/parse/optional/icon/icon.out
trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.in
trunk/Feed/tests/atom/regression/parse/optional/icon/icon_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:50:21 2007
@@ -186,6 +186,7 @@
case 'ttl':
case 'id': // ATOM only, required in ATOM
case 'image': // logo in ATOM
+ case 'icon': // only in ATOM
case 'docs':
case 'skipHours': // optional in RSS2
case 'skipDays': // optional in RSS2
@@ -232,6 +233,7 @@
case 'item':
case 'items':
case 'image': // logo in ATOM
+ case 'icon': // only 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:50:21 2007
@@ -329,6 +329,7 @@
case 'id':
case 'generator':
case 'image':
+ case 'icon':
$feed->$tagName = $channelChild->textContent;
break;
Added: trunk/Feed/tests/atom/regression/generate/optional/icon/icon.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/icon/icon.in (added)
+++ trunk/Feed/tests/atom/regression/generate/optional/icon/icon.in
[iso-8859-1] Tue Nov 13 15:50:21 2007
@@ -1,0 +1,7 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'icon' => 'Feed icon' );
+?>
Added: trunk/Feed/tests/atom/regression/generate/optional/icon/icon.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/icon/icon.out (added)
+++ trunk/Feed/tests/atom/regression/generate/optional/icon/icon.out
[iso-8859-1] Tue Nov 13 15:50:21 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>
+ <icon>Feed icon</icon>
+</feed>
Added: trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.in
(added)
+++ trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.in
[iso-8859-1] Tue Nov 13 15:50:21 2007
@@ -1,0 +1,7 @@
+<?php
+return array( 'id' => 'Feed id',
+ 'title' => array( array( '#' => 'Feed title',
+ 'type' => '' ) ),
+ 'updated' => 'Feed updated',
+ 'icon' => null );
+?>
Added: trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.out
(added)
+++ trunk/Feed/tests/atom/regression/generate/optional/icon/icon_empty.out
[iso-8859-1] Tue Nov 13 15:50:21 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>
+ <icon></icon>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/icon/icon.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/icon/icon.in (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/icon/icon.in [iso-8859-1]
Tue Nov 13 15:50:21 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>
+ <icon>Feed icon</icon>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/icon/icon.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/icon/icon.out (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/icon/icon.out [iso-8859-1]
Tue Nov 13 15:50:21 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->icon = 'Feed icon';
+
+return $feed;
+?>
Added: trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.in
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.in (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.in
[iso-8859-1] Tue Nov 13 15:50:21 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>
+ <icon/>
+</feed>
Added: trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
==============================================================================
--- trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out (added)
+++ trunk/Feed/tests/atom/regression/parse/optional/icon/icon_empty.out
[iso-8859-1] Tue Nov 13 15:50:21 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->icon = null;
+
+return $feed;
+?>
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
