From b81613e5e57fd208e832637b6886abf9ec806c4b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Jul 2013 12:25:28 -0400 Subject: [PATCH] [ticket/11700] With namespaces interface will no longer be a valid classname PHPBB3-11700 --- .../auth/provider/{interface.php => provider_interface.php} | 4 ++-- .../avatar/driver/{interface.php => driver_interface.php} | 2 +- .../cache/driver/{interface.php => driver_interface.php} | 2 +- .../db/migration/tool/{interface.php => tool_interface.php} | 2 +- .../extension/{interface.php => extension_interface.php} | 2 +- .../{interface.php => groupposition_interface.php} | 4 ++-- phpBB/phpbb/log/{interface.php => log_interface.php} | 2 +- .../method/{interface.php => method_interface.php} | 2 +- .../notification/type/{interface.php => type_interface.php} | 4 ++-- phpBB/phpbb/request/{interface.php => request_interface.php} | 2 +- phpBB/phpbb/tree/{interface.php => tree_interface.php} | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) rename phpBB/phpbb/auth/provider/{interface.php => provider_interface.php} (98%) rename phpBB/phpbb/avatar/driver/{interface.php => driver_interface.php} (98%) rename phpBB/phpbb/cache/driver/{interface.php => driver_interface.php} (98%) rename phpBB/phpbb/db/migration/tool/{interface.php => tool_interface.php} (92%) rename phpBB/phpbb/extension/{interface.php => extension_interface.php} (97%) rename phpBB/phpbb/groupposition/{interface.php => groupposition_interface.php} (95%) rename phpBB/phpbb/log/{interface.php => log_interface.php} (98%) rename phpBB/phpbb/notification/method/{interface.php => method_interface.php} (93%) rename phpBB/phpbb/notification/type/{interface.php => type_interface.php} (98%) rename phpBB/phpbb/request/{interface.php => request_interface.php} (99%) rename phpBB/phpbb/tree/{interface.php => tree_interface.php} (99%) diff --git a/phpBB/phpbb/auth/provider/interface.php b/phpBB/phpbb/auth/provider/provider_interface.php similarity index 98% rename from phpBB/phpbb/auth/provider/interface.php rename to phpBB/phpbb/auth/provider/provider_interface.php index 47043bc107..baf55c7a86 100644 --- a/phpBB/phpbb/auth/provider/interface.php +++ b/phpBB/phpbb/auth/provider/provider_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package auth */ -interface phpbb_auth_provider_interface +interface phpbb_auth_provider_provider_interface { /** * Checks whether the user is currently identified to the authentication @@ -98,7 +98,7 @@ interface phpbb_auth_provider_interface * into phpBB. * * @param array $user - * @return boolean true if the given user is authenticated, false if the + * @return boolean true if the given user is authenticated, false if the * session should be closed, or null if not implemented. */ public function validate_session($user); diff --git a/phpBB/phpbb/avatar/driver/interface.php b/phpBB/phpbb/avatar/driver/driver_interface.php similarity index 98% rename from phpBB/phpbb/avatar/driver/interface.php rename to phpBB/phpbb/avatar/driver/driver_interface.php index 3d62969aef..0a44a7a1fe 100644 --- a/phpBB/phpbb/avatar/driver/interface.php +++ b/phpBB/phpbb/avatar/driver/driver_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Interface for avatar drivers * @package phpBB3 */ -interface phpbb_avatar_driver_interface +interface phpbb_avatar_driver_driver_interface { /** * Returns the name of the driver. diff --git a/phpBB/phpbb/cache/driver/interface.php b/phpBB/phpbb/cache/driver/driver_interface.php similarity index 98% rename from phpBB/phpbb/cache/driver/interface.php rename to phpBB/phpbb/cache/driver/driver_interface.php index 53f684d1c8..34028b82e2 100644 --- a/phpBB/phpbb/cache/driver/interface.php +++ b/phpBB/phpbb/cache/driver/driver_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package acm */ -interface phpbb_cache_driver_interface +interface phpbb_cache_driver_driver_interface { /** * Load global cache diff --git a/phpBB/phpbb/db/migration/tool/interface.php b/phpBB/phpbb/db/migration/tool/tool_interface.php similarity index 92% rename from phpBB/phpbb/db/migration/tool/interface.php rename to phpBB/phpbb/db/migration/tool/tool_interface.php index ced53b2023..72344d50d2 100644 --- a/phpBB/phpbb/db/migration/tool/interface.php +++ b/phpBB/phpbb/db/migration/tool/tool_interface.php @@ -12,7 +12,7 @@ * * @package db */ -interface phpbb_db_migration_tool_interface +interface phpbb_db_migration_tool_tool_interface { /** * Retrieve a short name used for commands in migrations. diff --git a/phpBB/phpbb/extension/interface.php b/phpBB/phpbb/extension/extension_interface.php similarity index 97% rename from phpBB/phpbb/extension/interface.php rename to phpBB/phpbb/extension/extension_interface.php index 7b36a12bf6..b922499738 100644 --- a/phpBB/phpbb/extension/interface.php +++ b/phpBB/phpbb/extension/extension_interface.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package extension */ -interface phpbb_extension_interface +interface phpbb_extension_extension_interface { /** * enable_step is executed on enabling an extension until it returns false. diff --git a/phpBB/phpbb/groupposition/interface.php b/phpBB/phpbb/groupposition/groupposition_interface.php similarity index 95% rename from phpBB/phpbb/groupposition/interface.php rename to phpBB/phpbb/groupposition/groupposition_interface.php index eacc04e1a4..0f29984588 100644 --- a/phpBB/phpbb/groupposition/interface.php +++ b/phpBB/phpbb/groupposition/groupposition_interface.php @@ -22,7 +22,7 @@ if (!defined('IN_PHPBB')) * * @package phpBB3 */ -interface phpbb_groupposition_interface +interface phpbb_groupposition_groupposition_interface { /** * Returns the value for a given group, if the group exists. @@ -32,7 +32,7 @@ interface phpbb_groupposition_interface public function get_group_value($group_id); /** - * Get number of groups displayed + * Get number of groups displayed * * @return int value of the last item displayed */ diff --git a/phpBB/phpbb/log/interface.php b/phpBB/phpbb/log/log_interface.php similarity index 98% rename from phpBB/phpbb/log/interface.php rename to phpBB/phpbb/log/log_interface.php index 3b459c9bdf..2d41c9994f 100644 --- a/phpBB/phpbb/log/interface.php +++ b/phpBB/phpbb/log/log_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_log */ -interface phpbb_log_interface +interface phpbb_log_log_interface { /** * This function returns the state of the log system. diff --git a/phpBB/phpbb/notification/method/interface.php b/phpBB/phpbb/notification/method/method_interface.php similarity index 93% rename from phpBB/phpbb/notification/method/interface.php rename to phpBB/phpbb/notification/method/method_interface.php index ef875942cc..b3ca757d5f 100644 --- a/phpBB/phpbb/notification/method/interface.php +++ b/phpBB/phpbb/notification/method/method_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications method interface * @package notifications */ -interface phpbb_notification_method_interface +interface phpbb_notification_method_method_interface { /** * Get notification method name diff --git a/phpBB/phpbb/notification/type/interface.php b/phpBB/phpbb/notification/type/type_interface.php similarity index 98% rename from phpBB/phpbb/notification/type/interface.php rename to phpBB/phpbb/notification/type/type_interface.php index a40fdafd09..f9c65f7286 100644 --- a/phpBB/phpbb/notification/type/interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -19,7 +19,7 @@ if (!defined('IN_PHPBB')) * Base notifications interface * @package notifications */ -interface phpbb_notification_type_interface +interface phpbb_notification_type_type_interface { /** * Get notification type name @@ -27,7 +27,7 @@ interface phpbb_notification_type_interface * @return string */ public function get_type(); - + /** * Set initial data from the database * diff --git a/phpBB/phpbb/request/interface.php b/phpBB/phpbb/request/request_interface.php similarity index 99% rename from phpBB/phpbb/request/interface.php rename to phpBB/phpbb/request/request_interface.php index 741db35917..482f0f1287 100644 --- a/phpBB/phpbb/request/interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -20,7 +20,7 @@ if (!defined('IN_PHPBB')) * * @package phpbb_request */ -interface phpbb_request_interface +interface phpbb_request_request_interface { /**#@+ * Constant identifying the super global with the same name. diff --git a/phpBB/phpbb/tree/interface.php b/phpBB/phpbb/tree/tree_interface.php similarity index 99% rename from phpBB/phpbb/tree/interface.php rename to phpBB/phpbb/tree/tree_interface.php index cc8aab2115..80d3c4377c 100644 --- a/phpBB/phpbb/tree/interface.php +++ b/phpBB/phpbb/tree/tree_interface.php @@ -15,7 +15,7 @@ if (!defined('IN_PHPBB')) exit; } -interface phpbb_tree_interface +interface phpbb_tree_tree_interface { /** * Inserts an item into the database table and into the tree.