Author: as
Date: Mon Oct 8 14:40:56 2007
New Revision: 6387
Log:
- NULL -> null.
- private -> protected.
Modified:
trunk/Feed/src/feed_item.php
trunk/Feed/src/interfaces/processor.php
trunk/Feed/src/modules/content.php
trunk/Feed/src/modules/dublin_core.php
trunk/Feed/src/processors/rss.php
trunk/Feed/src/processors/rss2.php
trunk/Feed/src/structs/item_module_data.php
trunk/Feed/src/structs/module_data.php
trunk/Feed/tests/rss2/rss2_content_test.php
Modified: trunk/Feed/src/feed_item.php
==============================================================================
--- trunk/Feed/src/feed_item.php [iso-8859-1] (original)
+++ trunk/Feed/src/feed_item.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -10,7 +10,7 @@
*/
/**
- * ezcFeedItem.
+ * Class defining an item in a feed.
*
* @package Feed
* @version //autogentag//
@@ -19,7 +19,9 @@
class ezcFeedItem
{
public $feedProcessor;
- private $metaData = array();
+
+ protected $metaData = array();
+
public $moduleMetaData = array();
public function __construct( $processor )
@@ -145,7 +147,7 @@
{
return $this->metaData[$element];
}
- return NULL;
+ return null;
}
public function getAllModuleMetaData( $module )
Modified: trunk/Feed/src/interfaces/processor.php
==============================================================================
--- trunk/Feed/src/interfaces/processor.php [iso-8859-1] (original)
+++ trunk/Feed/src/interfaces/processor.php [iso-8859-1] Mon Oct 8 14:40:56
2007
@@ -20,8 +20,8 @@
*
* @var array(string=>ezcFeedModule)
*/
- private $modules = array();
- private $moduleMetaData = array();
+ protected $modules = array();
+ protected $moduleMetaData = array();
public function isModuleSupported( $moduleName )
{
@@ -62,7 +62,7 @@
{
return $this->moduleMetaData[$moduleName][$element];
}
- return NULL;
+ return null;
}
public function getModuleItemData( $moduleName, $moduleObj, $item,
$element )
@@ -71,7 +71,7 @@
{
return $item->moduleMetaData[$moduleName][$element];
}
- return NULL;
+ return null;
}
public function setModuleMetaData( $moduleName, $moduleObj, $element,
$value )
Modified: trunk/Feed/src/modules/content.php
==============================================================================
--- trunk/Feed/src/modules/content.php [iso-8859-1] (original)
+++ trunk/Feed/src/modules/content.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -15,8 +15,8 @@
*/
class ezcFeedModuleContent implements ezcFeedModule
{
- private $feedType;
- private $supportedItemElements = array( 'encoded' );
+ protected $feedType;
+ protected $supportedItemElements = array( 'encoded' );
public function __construct( $feedType )
{
Modified: trunk/Feed/src/modules/dublin_core.php
==============================================================================
--- trunk/Feed/src/modules/dublin_core.php [iso-8859-1] (original)
+++ trunk/Feed/src/modules/dublin_core.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -15,8 +15,8 @@
*/
class ezcFeedModuleDublinCore implements ezcFeedModule
{
- private $feedType;
- private $supportedElements = array(
+ protected $feedType;
+ protected $supportedElements = array(
'title', 'creator', 'subject', 'description', 'publisher',
'contributor', 'date', 'type', 'format', 'identifier',
'source', 'language', 'relation', 'coverage', 'rights'
Modified: trunk/Feed/src/processors/rss.php
==============================================================================
--- trunk/Feed/src/processors/rss.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/rss.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -18,7 +18,7 @@
protected $root;
protected $channel;
protected $items = array();
- private $metaData = array();
+ protected $metaData = array();
public function createRootElement( $version )
{
@@ -169,7 +169,7 @@
{
return $this->metaData[$element];
}
- return NULL;
+ return null;
}
protected function getAllMetaData()
Modified: trunk/Feed/src/processors/rss2.php
==============================================================================
--- trunk/Feed/src/processors/rss2.php [iso-8859-1] (original)
+++ trunk/Feed/src/processors/rss2.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -27,14 +27,14 @@
*
* @var array(string)
*/
- static $requiredFeedAttributes = array( 'title', 'link', 'description' );
+ protected static $requiredFeedAttributes = array( 'title', 'link',
'description' );
/**
* A list of optional attributes for the channel definition
*
* @var array(string)
*/
- static $optionalFeedAttributes = array(
+ protected static $optionalFeedAttributes = array(
'language', 'copyright', 'author', 'webMaster', 'published', 'updated',
'category', 'generator', 'ttl', 'docs', 'image' );
@@ -43,20 +43,20 @@
*
* @var array(string=>string)
*/
- static $feedAttributesMap = array(
+ protected static $feedAttributesMap = array(
'author' => 'managingEditor',
'published' => 'pubDate',
'updated' => 'lastBuildDate',
);
- static $requiredFeedItemAttributes = array( 'title', 'link', 'description'
);
- static $optionalFeedItemAttributes = array( 'author', 'category',
+ protected static $requiredFeedItemAttributes = array( 'title', 'link',
'description' );
+ protected static $optionalFeedItemAttributes = array( 'author', 'category',
'comments', 'enclosure', 'guid', 'published', 'source' );
- static $feedItemAttributesMap = array(
+ protected static $feedItemAttributesMap = array(
'published' => 'pubDate',
);
- private $usedPrefixes = array();
+ protected $usedPrefixes = array();
public function __construct()
{
@@ -117,7 +117,7 @@
return $item->getMetaData( $element );
}
- private function generateItem( $item )
+ protected function generateItem( $item )
{
$itemTag = $this->xml->createElement( 'item' );
$this->channel->appendChild( $itemTag );
Modified: trunk/Feed/src/structs/item_module_data.php
==============================================================================
--- trunk/Feed/src/structs/item_module_data.php [iso-8859-1] (original)
+++ trunk/Feed/src/structs/item_module_data.php [iso-8859-1] Mon Oct 8
14:40:56 2007
@@ -17,18 +17,18 @@
*/
class ezcFeedItemModuleData
{
- private $moduleName;
+ protected $moduleName;
public $moduleObj;
- private $item;
+ protected $item;
- function __construct( $moduleName, $moduleObj, $item )
+ public function __construct( $moduleName, $moduleObj, $item )
{
$this->moduleName = $moduleName;
$this->moduleObj = $moduleObj;
$this->item = $item;
}
- function __set( $element, $value )
+ public function __set( $element, $value )
{
if ( !$this->moduleObj->isItemElementAllowed( $element ) )
{
@@ -40,7 +40,7 @@
}
}
- function __get( $element )
+ public function __get( $element )
{
return $this->item->feedProcessor->getModuleItemData(
$this->moduleName, $this->moduleObj, $this->item, $element );
}
Modified: trunk/Feed/src/structs/module_data.php
==============================================================================
--- trunk/Feed/src/structs/module_data.php [iso-8859-1] (original)
+++ trunk/Feed/src/structs/module_data.php [iso-8859-1] Mon Oct 8 14:40:56 2007
@@ -17,18 +17,18 @@
*/
class ezcFeedModuleData
{
- private $moduleName;
+ protected $moduleName;
public $moduleObj;
- private $feedProcessor;
+ protected $feedProcessor;
- function __construct( $moduleName, $moduleObj, $feedProcessor )
+ public function __construct( $moduleName, $moduleObj, $feedProcessor )
{
$this->moduleName = $moduleName;
$this->moduleObj = $moduleObj;
$this->feedProcessor = $feedProcessor;
}
- function __set( $element, $value )
+ public function __set( $element, $value )
{
if ( !$this->moduleObj->isChannelElementAllowed( $element ) )
{
@@ -40,7 +40,7 @@
}
}
- function __get( $element )
+ public function __get( $element )
{
return $this->feedProcessor->getModuleMetaData( $this->moduleName,
$this->moduleObj, $element );
}
Modified: trunk/Feed/tests/rss2/rss2_content_test.php
==============================================================================
--- trunk/Feed/tests/rss2/rss2_content_test.php [iso-8859-1] (original)
+++ trunk/Feed/tests/rss2/rss2_content_test.php [iso-8859-1] Mon Oct 8
14:40:56 2007
@@ -19,7 +19,7 @@
date_default_timezone_set( 'Europe/Oslo' );
}
- static private function normalizeString( $str )
+ protected static function normalizeString( $str )
{
return trim( preg_replace( '@\s+@', ' ', $str ) );
}
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
