Index: kernel/notification/function_definition.php =================================================================== --- kernel/notification/function_definition.php (revision 20539) +++ kernel/notification/function_definition.php (working copy) @@ -32,17 +32,15 @@ $FunctionList = array(); $FunctionList['handler_list'] = array( 'name' => 'handler_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', 'method' => 'handlerList' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['digest_handlers'] = array( 'name' => 'digest_handlers', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', - 'method' => 'digestHandlerList' ), + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', + 'method' => 'digestHandlerList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'date', 'type' => 'integer', @@ -54,8 +52,7 @@ $FunctionList['digest_items'] = array( 'name' => 'digest_items', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', 'method' => 'digestItems' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'date', @@ -71,8 +68,7 @@ $FunctionList['event_content'] = array( 'name' => 'event_content', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', 'method' => 'eventContent' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'event_id', @@ -81,8 +77,7 @@ $FunctionList['subscribed_nodes'] = array( 'name' => 'subscribed_nodes', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', 'method' => 'subscribedNodes' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -96,8 +91,7 @@ $FunctionList['subscribed_nodes_count'] = array( 'name' => 'subscribed_nodes_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/notification/eznotificationfunctioncollection.php', - 'class' => 'eZNotificationFunctionCollection', + 'call_method' => array( 'class' => 'eZNotificationFunctionCollection', 'method' => 'subscribedNodesCount' ), 'parameter_type' => 'standard', 'parameters' => array() ); Index: kernel/collaboration/function_definition.php =================================================================== --- kernel/collaboration/function_definition.php (revision 20539) +++ kernel/collaboration/function_definition.php (working copy) @@ -32,8 +32,7 @@ $FunctionList = array(); $FunctionList['participant'] = array( 'name' => 'participant', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchParticipant' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'item_id', @@ -44,8 +43,7 @@ 'default' => false ) ) ); $FunctionList['participant_list'] = array( 'name' => 'participant_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchParticipantList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'item_id', @@ -62,8 +60,7 @@ 'default' => false ) ) ); $FunctionList['participant_map'] = array( 'name' => 'participant_map', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchParticipantMap' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'item_id', @@ -83,8 +80,7 @@ 'default' => false ) ) ); $FunctionList['message_list'] = array( 'name' => 'message_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchMessageList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'item_id', @@ -101,8 +97,7 @@ 'default' => false ) ) ); $FunctionList['item_list'] = array( 'name' => 'item_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchItemList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'sort_by', @@ -128,8 +123,7 @@ 'default' => null ) ) ); $FunctionList['item_count'] = array( 'name' => 'item_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchItemCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'is_read', @@ -146,8 +140,7 @@ 'default' => false ) ) ); $FunctionList['group_tree'] = array( 'name' => 'group_tree', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/collaboration/ezcollaborationfunctioncollection.php', - 'class' => 'eZCollaborationFunctionCollection', + 'call_method' => array( 'class' => 'eZCollaborationFunctionCollection', 'method' => 'fetchGroupTree' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_group_id', @@ -167,8 +160,7 @@ $FunctionList['tree_count'] = array( 'name' => 'tree_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectTreeCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node_id', Index: kernel/package/function_definition.php =================================================================== --- kernel/package/function_definition.php (revision 20539) +++ kernel/package/function_definition.php (working copy) @@ -31,8 +31,7 @@ $FunctionList = array(); $FunctionList['list'] = array( 'name' => 'list', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'fetchList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'filter_array', @@ -52,8 +51,7 @@ 'default' => false, 'required' => false ) ) ); $FunctionList['maintainer_role_list'] = array( 'name' => 'maintainer_role_list', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'fetchMaintainerRoleList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'type', @@ -65,65 +63,56 @@ 'required' => false, 'default' => false ) ) ); $FunctionList['can_create'] = array( 'name' => 'can_create', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canCreate' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_edit'] = array( 'name' => 'can_edit', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canEdit' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_import'] = array( 'name' => 'can_import', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canImport' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_install'] = array( 'name' => 'can_install', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canInstall' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_export'] = array( 'name' => 'can_export', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canExport' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_read'] = array( 'name' => 'can_read', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canRead' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_list'] = array( 'name' => 'can_list', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canList' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['can_remove'] = array( 'name' => 'can_remove', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'canRemove' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['item'] = array( 'name' => 'item', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'fetchPackage' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'package_name', @@ -135,8 +124,7 @@ 'required' => false ) ) ); $FunctionList['dependent_list'] = array( 'name' => 'dependent_list', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'fetchDependentPackageList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'package_name', @@ -151,8 +139,7 @@ 'default' => false, 'required' => false ) ) ); $FunctionList['repository_list'] = array( 'name' => 'repository_list', - 'call_method' => array( 'include_file' => 'kernel/package/ezpackagefunctioncollection.php', - 'class' => 'eZPackageFunctionCollection', + 'call_method' => array( 'class' => 'eZPackageFunctionCollection', 'method' => 'fetchRepositoryList' ), 'parameter_type' => 'standard', 'parameters' => array() ); Index: kernel/setup/function_definition.php =================================================================== --- kernel/setup/function_definition.php (revision 20539) +++ kernel/setup/function_definition.php (working copy) @@ -34,57 +34,49 @@ $FunctionList['version'] = array( 'name' => 'version', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchFullVersionString' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['major_version'] = array( 'name' => 'major_version', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchMajorVersion' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['minor_version'] = array( 'name' => 'minor_version', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchMinorVersion' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['release'] = array( 'name' => 'release', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchRelease' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['state'] = array( 'name' => 'state', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchState' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['is_development'] = array( 'name' => 'is_development', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchIsDevelopment' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['revision'] = array( 'name' => 'revision', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchRevision' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['database_version'] = array( 'name' => 'database_version', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchDatabaseVersion' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'with_release', @@ -93,8 +85,7 @@ 'default' => true ) ) ); $FunctionList['database_release'] = array( 'name' => 'database_release', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/setup/ezsetupfunctioncollection.php', - 'class' => 'eZSetupFunctionCollection', + 'call_method' => array( 'class' => 'eZSetupFunctionCollection', 'method' => 'fetchDatabaseRelease' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); Index: kernel/role/function_definition.php =================================================================== --- kernel/role/function_definition.php (revision 20539) +++ kernel/role/function_definition.php (working copy) @@ -35,8 +35,7 @@ $FunctionList = array(); $FunctionList['role'] = array( 'name' => 'role', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/role/ezrolefunctioncollection.php', - 'class' => 'eZRoleFunctionCollection', + 'call_method' => array( 'class' => 'eZRoleFunctionCollection', 'method' => 'fetchRole' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'role_id', Index: kernel/infocollector/function_definition.php =================================================================== --- kernel/infocollector/function_definition.php (revision 20539) +++ kernel/infocollector/function_definition.php (working copy) @@ -34,8 +34,7 @@ $FunctionList['collected_info_count'] = array( 'name' => 'collected_info_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/infocollector/ezinfocollectorfunctioncollection.php', - 'class' => 'eZInfocollectorFunctionCollection', + 'call_method' => array( 'class' => 'eZInfocollectorFunctionCollection', 'method' => 'fetchCollectedInfoCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_attribute_id', @@ -61,8 +60,7 @@ $FunctionList['collected_info_count_list'] = array( 'name' => 'collected_info_count_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/infocollector/ezinfocollectorfunctioncollection.php', - 'class' => 'eZInfocollectorFunctionCollection', + 'call_method' => array( 'class' => 'eZInfocollectorFunctionCollection', 'method' => 'fetchCollectedInfoCountList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_attribute_id', @@ -73,8 +71,7 @@ $FunctionList['collected_info_collection'] = array( 'name' => 'collected_info_collection', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/infocollector/ezinfocollectorfunctioncollection.php', - 'class' => 'eZInfocollectorFunctionCollection', + 'call_method' => array( 'class' => 'eZInfocollectorFunctionCollection', 'method' => 'fetchCollectedInfoCollection' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'collection_id', @@ -88,8 +85,7 @@ $FunctionList['collected_info_list'] = array( 'name' => 'collected_info_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/infocollector/ezinfocollectorfunctioncollection.php', - 'class' => 'eZInfocollectorFunctionCollection', + 'call_method' => array( 'class' => 'eZInfocollectorFunctionCollection', 'method' => 'fetchCollectionsList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', Index: kernel/url/function_definition.php =================================================================== --- kernel/url/function_definition.php (revision 20539) +++ kernel/url/function_definition.php (working copy) @@ -32,8 +32,7 @@ $FunctionList = array(); $FunctionList['list'] = array( 'name' => 'list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/url/ezurlfunctioncollection.php', - 'class' => 'eZURLFunctionCollection', + 'call_method' => array( 'class' => 'eZURLFunctionCollection', 'method' => 'fetchList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'is_valid', @@ -50,8 +49,7 @@ 'default' => false ) ) ); $FunctionList['list_count'] = array( 'name' => 'list_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/url/ezurlfunctioncollection.php', - 'class' => 'eZURLFunctionCollection', + 'call_method' => array( 'class' => 'eZURLFunctionCollection', 'method' => 'fetchListCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'is_valid', Index: kernel/section/function_definition.php =================================================================== --- kernel/section/function_definition.php (revision 20539) +++ kernel/section/function_definition.php (working copy) @@ -32,8 +32,7 @@ $FunctionList = array(); $FunctionList['object'] = array( 'name' => 'object', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchSectionObject' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'section_id', @@ -41,15 +40,13 @@ 'required' => true ) ) ); $FunctionList['list'] = array( 'name' => 'list', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchSectionList' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['object_list'] = array( 'name' => 'object_list', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchObjectList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'section_id', @@ -73,8 +70,7 @@ 'default' => false ) ) ); $FunctionList['object_list_count'] = array( 'name' => 'object_list_count', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchObjectListCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'section_id', @@ -86,8 +82,7 @@ 'default' => false ) ) ); $FunctionList['roles'] = array( 'name' => 'roles', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchRoles' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'section_id', @@ -95,8 +90,7 @@ 'required' => true ) ) ); $FunctionList['user_roles'] = array( 'name' => 'user_roles', - 'call_method' => array( 'include_file' => 'kernel/section/ezsectionfunctioncollection.php', - 'class' => 'eZSectionFunctionCollection', + 'call_method' => array( 'class' => 'eZSectionFunctionCollection', 'method' => 'fetchUserRoles' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'section_id', Index: kernel/class/function_definition.php =================================================================== --- kernel/class/function_definition.php (revision 20539) +++ kernel/class/function_definition.php (working copy) @@ -32,8 +32,7 @@ $FunctionList = array(); $FunctionList['list'] = array( 'name' => 'list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/class/ezclassfunctioncollection.php', - 'class' => 'eZClassFunctionCollection', + 'call_method' => array( 'class' => 'eZClassFunctionCollection', 'method' => 'fetchClassList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_filter', @@ -46,8 +45,7 @@ 'default' => array() ) ) ); $FunctionList['latest_list'] = array( 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/class/ezclassfunctioncollection.php', - 'class' => 'eZClassFunctionCollection', + 'call_method' => array( 'class' => 'eZClassFunctionCollection', 'method' => 'fetchLatestClassList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -61,8 +59,7 @@ $FunctionList['attribute_list'] = array( 'name' => 'attribute_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/class/ezclassfunctioncollection.php', - 'class' => 'eZClassFunctionCollection', + 'call_method' => array( 'class' => 'eZClassFunctionCollection', 'method' => 'fetchClassAttributeList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_id', @@ -73,12 +70,11 @@ $FunctionList['override_template_list'] = array( 'name' => 'override_template_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/class/ezclassfunctioncollection.php', - 'class' => 'eZClassFunctionCollection', - 'method' => 'fetchOverrideTemplateList' ), - 'parameter_type' => 'standard', - 'parameters' => array( array( 'name' => 'class_id', - 'type' => 'integer', - 'required' => true ) ) ); + 'call_method' => array( 'class' => 'eZClassFunctionCollection', + 'method' => 'fetchOverrideTemplateList' ), + 'parameter_type' => 'standard', + 'parameters' => array( array( 'name' => 'class_id', + 'type' => 'integer', + 'required' => true ) ) ); ?> Index: kernel/search/function_definition.php =================================================================== --- kernel/search/function_definition.php (revision 20539) +++ kernel/search/function_definition.php (working copy) @@ -32,15 +32,13 @@ $FunctionList = array(); $FunctionList['list_count'] = array( 'name' => 'list_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/search/ezsearchfunctioncollection.php', - 'class' => 'eZSearchFunctionCollection', - 'method' => 'fetchSearchListCount' ), + 'call_method' => array( 'class' => 'eZSearchFunctionCollection', + 'method' => 'fetchSearchListCount' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['list'] = array( 'name' => 'list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/search/ezsearchfunctioncollection.php', - 'class' => 'eZSearchFunctionCollection', + 'call_method' => array( 'class' => 'eZSearchFunctionCollection', 'method' => 'fetchSearchList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', Index: kernel/shop/function_definition.php =================================================================== --- kernel/shop/function_definition.php (revision 20539) +++ kernel/shop/function_definition.php (working copy) @@ -32,16 +32,14 @@ $FunctionList = array(); $FunctionList['basket'] = array( 'name' => 'basket', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchBasket' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['best_sell_list'] = array( 'name' => 'best_sell_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchBestSellList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'top_parent_node_id', @@ -77,8 +75,7 @@ $FunctionList['related_purchase'] = array( 'name' => 'related_purchase', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchRelatedPurchaseList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'contentobject_id', @@ -90,8 +87,7 @@ $FunctionList['wish_list'] = array( 'name' => 'wish_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchWishList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'production_id', @@ -108,8 +104,7 @@ $FunctionList['wish_list_count'] = array( 'name' => 'wish_list_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchWishListCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'production_id', @@ -117,8 +112,7 @@ 'required' => true ) ) ); $FunctionList['order_status_history_count'] = array( 'name' => 'order_status_history_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchOrderStatusHistoryCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'order_id', @@ -126,17 +120,15 @@ 'required' => true ) ) ); $FunctionList['order_status_history'] = array( 'name' => 'order_status_history', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', - 'method' => 'fetchOrderStatusHistory' ), + 'call_method' => array( 'class' => 'eZShopFunctionCollection', + 'method' => 'fetchOrderStatusHistory' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'order_id', 'type' => 'integer', 'required' => true ) ) ); $FunctionList['currency_list'] = array( 'name' => 'currency_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchCurrencyList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'status', @@ -145,8 +137,7 @@ $FunctionList['currency'] = array( 'name' => 'currency', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchCurrency' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'code', @@ -155,24 +146,21 @@ $FunctionList['preferred_currency_code'] = array( 'name' => 'preferred_currency_code', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchPreferredCurrencyCode' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['user_country'] = array( 'name' => 'user_country', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchUserCountry' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['product_category_list'] = array( 'name' => 'product_category_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchProductCategoryList' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); @@ -180,8 +168,7 @@ $FunctionList['product_category'] = array( 'name' => 'product_category', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/shop/ezshopfunctioncollection.php', - 'class' => 'eZShopFunctionCollection', + 'call_method' => array( 'class' => 'eZShopFunctionCollection', 'method' => 'fetchProductCategory' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'category_id', Index: kernel/content/function_definition.php =================================================================== --- kernel/content/function_definition.php (revision 20539) +++ kernel/content/function_definition.php (working copy) @@ -33,8 +33,7 @@ $FunctionList['object'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchContentObject' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -42,8 +41,7 @@ 'required' => true ) ) ); $FunctionList['version'] = array( 'name' => 'version', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchContentVersion' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -55,8 +53,7 @@ 'required' => true ) ) ); $FunctionList['node'] = array( 'name' => 'node', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchContentNode' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'node_id', @@ -69,8 +66,7 @@ 'default' => false ) ) ); $FunctionList['locale_list'] = array( 'name' => 'locale_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchLocaleList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'with_variations', @@ -79,8 +75,7 @@ 'default' => true ) ) ); $FunctionList['locale'] = array( 'name' => 'locale', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchLocale' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'locale_code', @@ -90,29 +85,25 @@ $FunctionList['prioritized_languages'] = array( 'name' => 'prioritized_languages', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchPrioritizedLanguages' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['prioritized_language_codes'] = array( 'name' => 'prioritized_language_codes', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchPrioritizedLanguageCodes' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['translation_list'] = array( 'name' => 'translation_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchTranslationList' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['non_translation_list'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchNonTranslationList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -123,8 +114,7 @@ 'required' => true ) ) ); $FunctionList['class'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchClass' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_id', @@ -132,8 +122,7 @@ 'required' => true ) ) ); $FunctionList['class_attribute_list'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchClassAttributeList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_id', @@ -145,8 +134,7 @@ 'default' => 0 ) ) ); $FunctionList['class_attribute'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchClassAttribute' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'attribute_id', @@ -158,8 +146,7 @@ 'default' => 0 ) ) ); $FunctionList['calendar'] = array( 'name' => 'calendar', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'calendar' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node_id', @@ -220,8 +207,7 @@ $FunctionList['list'] = array( 'name' => 'tree', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectTree' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node_id', @@ -305,8 +291,7 @@ 'default' => true ) ) ); $FunctionList['list_count'] = array( 'name' => 'list_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectTreeCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node_id', @@ -362,7 +347,7 @@ 'default' => null ) ) ); $FunctionList['tree'] = array( 'name' => 'tree', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectTree' ), 'parameter_type' => 'standard', @@ -448,8 +433,7 @@ $FunctionList['tree_count'] = array( 'name' => 'tree_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectTreeCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node_id', @@ -506,8 +490,7 @@ $FunctionList['search'] = array( 'name' => 'search', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchContentSearch' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'text', @@ -560,8 +543,7 @@ $FunctionList['trash_count'] = array( 'name' => 'trash_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchTrashObjectCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'objectname_filter', @@ -571,8 +553,7 @@ $FunctionList['trash_object_list'] = array( 'name' => 'trash_object_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchTrashObjectList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -590,16 +571,14 @@ $FunctionList['draft_count'] = array( 'name' => 'draft_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchDraftVersionCount' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['draft_version_list'] = array( 'name' => 'draft_version_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchDraftVersionList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -613,16 +592,14 @@ $FunctionList['pending_count'] = array( 'name' => 'pending_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchPendingCount' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['pending_list'] = array( 'name' => 'pending_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchPendingList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -636,8 +613,7 @@ $FunctionList['version_count'] = array( 'name' => 'version_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchVersionCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'contentobject', @@ -646,8 +622,7 @@ $FunctionList['version_list'] = array( 'name' => 'version_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchVersionList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'contentobject', @@ -666,8 +641,7 @@ $FunctionList['can_instantiate_class_list'] = array( 'name' => 'can_instantiate_class_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'canInstantiateClassList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'group_id', @@ -693,8 +667,7 @@ $FunctionList['can_instantiate_classes'] = array( 'name' => 'can_instantiate_classes', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'canInstantiateClasses' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'parent_node', @@ -703,8 +676,7 @@ 'default' => 0 ) ) ); $FunctionList['contentobject_attributes'] = array( 'name' => 'contentobject_attributes', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'contentobjectAttributes' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'version', @@ -718,8 +690,7 @@ $FunctionList['bookmarks'] = array( 'name' => 'bookmarks', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchBookmarks' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -733,24 +704,21 @@ $FunctionList['recent'] = array( 'name' => 'recent', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchRecent' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['section_list'] = array( 'name' => 'section_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchSectionList' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['tipafriend_top_list'] = array( 'name' => 'tipafriend_top_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchTipafriendTopList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'offset', @@ -784,8 +752,7 @@ $FunctionList['view_top_list'] = array( 'name' => 'view_top_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchMostViewedTopList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_id', @@ -807,8 +774,7 @@ $FunctionList['collected_info_count'] = array( 'name' => 'collected_info_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchCollectedInfoCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_attribute_id', @@ -834,8 +800,7 @@ $FunctionList['collected_info_count_list'] = array( 'name' => 'collected_info_count_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchCollectedInfoCountList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_attribute_id', @@ -846,8 +811,7 @@ $FunctionList['collected_info_collection'] = array( 'name' => 'collected_info_collection', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchCollectedInfoCollection' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'collection_id', @@ -861,8 +825,7 @@ $FunctionList['collected_info_list'] = array( 'name' => 'collected_info_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchCollectionsList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -892,8 +855,7 @@ $FunctionList['object_by_attribute'] = array( 'name' => 'object_by_attribute', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchObjectByAttribute' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'identifier', @@ -903,9 +865,8 @@ $FunctionList['object_count_by_user_id'] = array( 'name' => 'object_count_by_user_id', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', - 'method' => 'fetchObjectCountByUserID' ), + 'call_method' => array( 'class' => 'eZContentFunctionCollection', + 'method' => 'fetchObjectCountByUserID' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'class_id', 'type' => 'integer', @@ -918,8 +879,7 @@ $FunctionList['same_classattribute_node'] = array( 'name' => 'same_classattribute_node', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchSameClassAttributeNodeList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'classattribute_id', @@ -934,8 +894,7 @@ $FunctionList['keyword'] = array( 'name' => 'keyword', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchKeyword' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'alphabet', @@ -968,8 +927,7 @@ $FunctionList['keyword_count'] = array( 'name' => 'keyword_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchKeywordCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'alphabet', @@ -990,8 +948,7 @@ $FunctionList['access'] = array( 'name' => 'access', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'checkAccess' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'access', @@ -1016,8 +973,7 @@ // Fetches all navigation parts as an array $FunctionList['navigation_parts'] = array( 'name' => 'navigation_parts', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchNavigationParts' ), 'parameter_type' => 'standard', 'parameters' => array() ); @@ -1025,8 +981,7 @@ // Fetches one navigation part by identifier $FunctionList['navigation_part'] = array( 'name' => 'navigation_part', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchNavigationPart' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'identifier', @@ -1036,8 +991,7 @@ // Fetches related objects array $FunctionList['related_objects'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchRelatedObjects' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1062,8 +1016,7 @@ $FunctionList['related_objects_count'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchRelatedObjectsCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1080,8 +1033,7 @@ // Fetches reverse related objects array $FunctionList['reverse_related_objects'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchReverseRelatedObjects' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1109,8 +1061,7 @@ $FunctionList['reverse_related_objects_count'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchReverseRelatedObjectsCount' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1130,16 +1081,14 @@ $FunctionList['available_sort_fields'] = array( 'name' => 'available_sort_fields', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchAvailableSortFieldList' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['country_list'] = array( 'name' => 'country', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchCountryList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'filter', @@ -1151,8 +1100,7 @@ $FunctionList['related_objects_ids'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchRelatedObjectsID' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1169,8 +1117,7 @@ $FunctionList['reverse_related_objects_ids'] = array( 'name' => 'object', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchReverseRelatedObjectsID' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'object_id', @@ -1187,8 +1134,7 @@ $FunctionList['content_tree_menu_expiry'] = array( 'name' => 'content_tree_menu_expiry', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/content/ezcontentfunctioncollection.php', - 'class' => 'eZContentFunctionCollection', + 'call_method' => array( 'class' => 'eZContentFunctionCollection', 'method' => 'fetchContentTreeMenuExpiry' ), 'parameter_type' => 'standard', 'parameters' => array() ); Index: kernel/workflow/function_definition.php =================================================================== --- kernel/workflow/function_definition.php (revision 20539) +++ kernel/workflow/function_definition.php (working copy) @@ -33,16 +33,14 @@ $FunctionList['workflow_statuses'] = array( 'name' => 'workflow_statuses', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/workflow/ezworkflowfunctioncollection.php', - 'class' => 'eZWorkflowFunctionCollection', + 'call_method' => array( 'class' => 'eZWorkflowFunctionCollection', 'method' => 'fetchWorkflowStatuses' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); $FunctionList['workflow_type_statuses'] = array( 'name' => 'workflow_type_statuses', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/workflow/ezworkflowfunctioncollection.php', - 'class' => 'eZWorkflowFunctionCollection', + 'call_method' => array( 'class' => 'eZWorkflowFunctionCollection', 'method' => 'fetchWorkflowTypeStatuses' ), 'parameter_type' => 'standard', 'parameters' => array( ) ); Index: kernel/user/function_definition.php =================================================================== --- kernel/user/function_definition.php (revision 20539) +++ kernel/user/function_definition.php (working copy) @@ -32,16 +32,14 @@ $FunctionList = array(); $FunctionList['current_user'] = array( 'name' => 'current_user', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchCurrentUser' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['is_logged_in'] = array( 'name' => 'is_logged_in', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchIsLoggedIn' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'user_id', @@ -50,24 +48,21 @@ $FunctionList['logged_in_count'] = array( 'name' => 'logged_in_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchLoggedInCount' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['anonymous_count'] = array( 'name' => 'anonymous_count', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchAnonymousCount' ), 'parameter_type' => 'standard', 'parameters' => array() ); $FunctionList['logged_in_list'] = array( 'name' => 'logged_in_list', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchLoggedInList' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'sort_by', @@ -82,8 +77,7 @@ $FunctionList['logged_in_users'] = array( 'name' => 'logged_in_users', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchLoggedInUsers' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'sort_by', @@ -97,8 +91,7 @@ 'required' => false ) ) ); $FunctionList['user_role'] = array( 'name' => 'user_role', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchUserRole' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'user_id', @@ -108,8 +101,7 @@ $FunctionList['member_of'] = array( 'name' => 'member_of', 'operation_types' => array( 'read' ), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'fetchMemberOf' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'id', @@ -118,8 +110,7 @@ $FunctionList['has_access_to'] = array( 'name' => 'has_access_to', 'operation_types' => array(), - 'call_method' => array( 'include_file' => 'kernel/user/ezuserfunctioncollection.php', - 'class' => 'eZUserFunctionCollection', + 'call_method' => array( 'class' => 'eZUserFunctionCollection', 'method' => 'hasAccessTo' ), 'parameter_type' => 'standard', 'parameters' => array( array( 'name' => 'module',