Author: as
Date: Fri Nov  2 13:15:51 2007
New Revision: 6672

Log:
- Fixed tests for 'channel/about' RSS1 feed attribute.

Modified:
    trunk/Feed/src/processors/rss1.php
    
trunk/Feed/tests/rss1/regression/generate/incomplete/title+link+description+item.in
    trunk/Feed/tests/rss1/regression/generate/item/item_empty.in

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] Fri Nov  2 13:15:51 2007
@@ -34,9 +34,6 @@
     protected static $rss1Schema = array(
         // these are actually part of channel: title, link, description, 
items, image, textinput
         // the channel also requires the rdf:about attribute
-        'channel'      => array( '#'          => 'none',
-                                 'ATTRIBUTES' => array( 'about' => 'string' ), 
),
-
         'title'        => array( '#' => 'string' ),
         'link'         => array( '#' => 'string' ),
         'description'  => array( '#' => 'string' ),
@@ -83,6 +80,7 @@
                                                                             
'link' ),
                                                    ), ),
 
+        // the channel/about attribute is required
         'ATTRIBUTES'   => array( 'about'      => 'string' ),
 
         'REQUIRED'     => array( 'title', 'link', 'description' ),

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] Fri Nov  2 13:15:51 2007
@@ -1,5 +1,5 @@
 <?php
-return array( 'channel' => array( array( 'about' => 'Channel about' ) ),
+return array( 'about' => '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] 
Fri Nov  2 13:15:51 2007
@@ -1,5 +1,5 @@
 <?php
-return array( 'channel' => array( array( 'about' => 'Channel about' ) ),
+return array( 'about' => 'Channel about',
               'title' => 'Feed title',
               'link' => 'Feed link',
               'description' => 'Feed description',


-- 
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components

Reply via email to