Author: as Date: Mon Feb 4 11:22:43 2008 New Revision: 7278 Log: - The about RSS1 attribute is accessed as id through ezcFeed.
Modified: trunk/Feed/ChangeLog trunk/Feed/src/feed.php trunk/Feed/src/processors/rss1.php trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description+item.in trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description.in trunk/Feed/tests/rss1/regression/generate/incomplete/title+link.in trunk/Feed/tests/rss1/regression/generate/incomplete/title.in trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in trunk/Feed/tests/rss1/regression/generate/item/item_about.in trunk/Feed/tests/rss1/regression/generate/item/item_empty.in trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in trunk/Feed/tests/rss1/regression/parse/item/item_description.in trunk/Feed/tests/rss1/regression/parse/item/item_description.out trunk/Feed/tests/rss1/regression/parse/item/item_empty.in trunk/Feed/tests/rss1/regression/parse/item/item_empty.out trunk/Feed/tests/rss1/regression/parse/item/item_link.in trunk/Feed/tests/rss1/regression/parse/item/item_link.out trunk/Feed/tests/rss1/regression/parse/item/item_multiple.in trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.in trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out trunk/Feed/tests/rss1/regression/parse/item/item_title+link.in trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out trunk/Feed/tests/rss1/regression/parse/item/item_title.in trunk/Feed/tests/rss1/regression/parse/item/item_title.out trunk/Feed/tests/rss1/regression/parse/optional/image/image.in trunk/Feed/tests/rss1/regression/parse/optional/image/image.out trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.in trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.out trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.in trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.out trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_about.out trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_complete.out trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_empty.out trunk/Feed/tests/rss1/regression/parse/simple/about+title+link+description.out trunk/Feed/tests/rss1/regression/parse/simple/about.out Modified: trunk/Feed/ChangeLog ============================================================================== --- trunk/Feed/ChangeLog [iso-8859-1] (original) +++ trunk/Feed/ChangeLog [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -15,6 +15,7 @@ - Completed support for creating and parsing ATOM feeds. - Added the getContentType() method in ezcFeed to return its Content-Type. - Added support for ATOM xml:lang attribute. +- The RSS1 about attribute is accessed as id through ezcFeed. 1.0beta1 - Monday 18 December 2006 Modified: trunk/Feed/src/feed.php ============================================================================== --- trunk/Feed/src/feed.php [iso-8859-1] (original) +++ trunk/Feed/src/feed.php [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -194,7 +194,7 @@ case 'updated': // lastBuildDate in RSS2, required in ATOM case 'generator': case 'ttl': - case 'id': // ATOM only, required in ATOM + case 'id': // required in ATOM, about in RSS1, ignored in RSS2 case 'image': // logo in ATOM case 'icon': // only in ATOM case 'docs': @@ -203,7 +203,6 @@ case 'rating': case 'textInput': case 'cloud': - case 'about': // required in RSS1 $this->feedProcessor->set( $property, $value ); break; @@ -241,7 +240,7 @@ case 'updated': // lastBuildDate in RSS2, required in ATOM case 'generator': case 'ttl': - case 'id': // ATOM only, required in ATOM + case 'id': // required in ATOM, about in RSS1, ignored in RSS2 case 'item': case 'items': case 'image': // logo in ATOM @@ -252,7 +251,6 @@ case 'rating': case 'textInput': case 'cloud': - case 'about': // required in RSS1 $value = $this->feedProcessor->get( $property ); return $value; Modified: trunk/Feed/src/processors/rss1.php ============================================================================== --- trunk/Feed/src/processors/rss1.php [iso-8859-1] (original) +++ trunk/Feed/src/processors/rss1.php [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -93,7 +93,8 @@ 'MULTI' => array( 'items' => 'item' ), - 'ELEMENTS_MAP' => array( 'textInput' => 'textinput' ), + 'ELEMENTS_MAP' => array( 'textInput' => 'textinput', + 'id' => 'about' ), ); @@ -160,7 +161,7 @@ */ protected function generateChannel() { - $data = $this->get( 'about' ); + $data = $this->get( 'id' ); if ( is_null( $data ) ) { @@ -429,6 +430,12 @@ throw new ezcFeedParseErrorException( "No channel tag" ); } + foreach ( ezcFeedTools::getAttributes( $channel ) as $key => $value ) + { + $tagName = ezcFeedTools::deNormalizeName( $key, $this->schema->getElementsMap() ); + $feed->$tagName = $value; + } + foreach ( $channel->childNodes as $channelChild ) { if ( $channelChild->nodeType == XML_ELEMENT_NODE ) @@ -490,10 +497,6 @@ } } - foreach ( ezcFeedTools::getAttributes( $channel ) as $key => $value ) - { - $feed->$key = $value; - } return $feed; } Modified: trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description+item.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description+item.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description+item.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/incomplete/title+link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/incomplete/title+link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/incomplete/title+link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', ); Modified: trunk/Feed/tests/rss1/regression/generate/incomplete/title.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/incomplete/title.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/incomplete/title.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', ); ?> Modified: trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/item/item_about+title+link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/item/item_about+title.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/item/item_about.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/item/item_about.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/item/item_about.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/item/item_empty.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/item/item_empty.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/item/item_empty.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/item/item_multiple.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url+link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title+url.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_about+title.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_about.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/image/image_empty.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name+link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description+name.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title+description.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about+title.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_about.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in ============================================================================== --- trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/generate/optional/textinput/textinput_empty.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,5 +1,5 @@ <?php -return array( 'about' => 'Channel about', +return array( 'id' => 'Channel about', 'title' => 'Feed title', 'link' => 'Feed link', 'description' => 'Feed description', Modified: trunk/Feed/tests/rss1/regression/parse/item/item_description.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_description.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_description.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_description.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_description.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_description.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_empty.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_empty.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_empty.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <link>Feed link</link> <description>Feed description</description> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_empty.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_empty.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_empty.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_link.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_link.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_link.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_multiple.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_multiple.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_multiple.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_multiple.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link+description.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title+link.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title+link.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title+link.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <description>Feed description</description> <link>Feed link</link> Modified: trunk/Feed/tests/rss1/regression/parse/item/item_title.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/item/item_title.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/item/item_title.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->description = 'Feed description'; $feed->link = 'Feed link'; Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <link>Feed link</link> <description>Feed description</description> Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <link>Feed link</link> <description>Feed description</description> Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image_complete.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.in ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.in [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.in [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/"> - <channel> + <channel rdf:about="Channel about"> <title>Feed title</title> <link>Feed link</link> <description>Feed description</description> Modified: trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/image/image_empty.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; Modified: trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_about.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_about.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_about.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; @@ -8,7 +9,5 @@ $textInput = $feed->add( 'textInput' ); $textInput->about = 'Textinput about'; -$feed->about = 'Channel about'; - return $feed; ?> Modified: trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_complete.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_complete.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_complete.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,6 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; @@ -12,7 +13,5 @@ $textInput->link = 'Textinput link'; $textInput->about = 'Textinput about'; -$feed->about = 'Channel about'; - return $feed; ?> Modified: trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_empty.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_empty.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/optional/textinput/textinput_empty.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,13 +1,12 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; $textInput = $feed->add( 'textInput' ); -$feed->about = 'Channel about'; - return $feed; ?> Modified: trunk/Feed/tests/rss1/regression/parse/simple/about+title+link+description.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/simple/about+title+link+description.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/simple/about+title+link+description.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,10 +1,10 @@ <?php $feed = new ezcFeed( 'rss1' ); +$feed->id = 'Channel about'; $feed->title = 'Feed title'; $feed->link = 'Feed link'; $feed->description = 'Feed description'; -$feed->about = 'Channel about'; return $feed; ?> Modified: trunk/Feed/tests/rss1/regression/parse/simple/about.out ============================================================================== --- trunk/Feed/tests/rss1/regression/parse/simple/about.out [iso-8859-1] (original) +++ trunk/Feed/tests/rss1/regression/parse/simple/about.out [iso-8859-1] Mon Feb 4 11:22:43 2008 @@ -1,7 +1,7 @@ <?php $feed = new ezcFeed( 'rss1' ); -$feed->about = 'Channel about'; +$feed->id = 'Channel about'; return $feed; ?> -- svn-components mailing list svn-components@lists.ez.no http://lists.ez.no/mailman/listinfo/svn-components