From 29846bb1048c025935706934e00e850130fa5842 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 14 Jan 2013 12:59:52 +0100 Subject: [PATCH] Renames IRouteController::getID() to IRouteController::getObjectID() Because of `DatabaseObject::getObjectID()`, you don't need to implement such a method when implementing `IRouteController`. --- .../install/files/lib/data/category/Category.class.php | 7 ------- wcfsetup/install/files/lib/data/user/User.class.php | 7 ------- .../files/lib/system/request/IRouteController.class.php | 4 ++-- .../install/files/lib/system/request/LinkHandler.class.php | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/wcfsetup/install/files/lib/data/category/Category.class.php b/wcfsetup/install/files/lib/data/category/Category.class.php index 85be108260..573954589d 100644 --- a/wcfsetup/install/files/lib/data/category/Category.class.php +++ b/wcfsetup/install/files/lib/data/category/Category.class.php @@ -64,13 +64,6 @@ class Category extends ProcessibleDatabaseObject implements IRouteController { return $value; } - /** - * @see wcf\system\request\IRouteController::getID() - */ - public function getID() { - return $this->categoryID; - } - /** * Returns the category object type of the category. * diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php index b8f40fc855..233a99d559 100644 --- a/wcfsetup/install/files/lib/data/user/User.class.php +++ b/wcfsetup/install/files/lib/data/user/User.class.php @@ -375,13 +375,6 @@ final class User extends DatabaseObject implements IRESTfulResponse, IRouteContr return 'user_table'; } - /** - * @see wcf\system\request\IRouteController::getID() - */ - public function getID() { - return $this->userID; - } - /** * @see wcf\system\request\IRouteController::getTitle() */ diff --git a/wcfsetup/install/files/lib/system/request/IRouteController.class.php b/wcfsetup/install/files/lib/system/request/IRouteController.class.php index 5d20ecd0cd..9ed32a82af 100644 --- a/wcfsetup/install/files/lib/system/request/IRouteController.class.php +++ b/wcfsetup/install/files/lib/system/request/IRouteController.class.php @@ -14,9 +14,9 @@ use wcf\data\ITitledDatabaseObject; */ interface IRouteController extends ITitledDatabaseObject { /** - * Returns the object id. + * Returns the id of the object. * * @return integer */ - public function getID(); + public function getObjectID(); } diff --git a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php index 687fbb807b..496467f0f8 100644 --- a/wcfsetup/install/files/lib/system/request/LinkHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/LinkHandler.class.php @@ -89,7 +89,7 @@ class LinkHandler extends SingletonFactory { } if ($parameters['object'] instanceof IRouteController) { - $parameters['id'] = $parameters['object']->getID(); + $parameters['id'] = $parameters['object']->getObjectID(); $parameters['title'] = $parameters['object']->getTitle(); } -- 2.20.1