From f837ed3b51b8bf7fdcd738886e59a6579cbfb0b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 7 Feb 2013 21:47:26 +0000 Subject: [PATCH] Use interface DatabaseWrapper instead of generic class BaseDatabaseWrapper as a typ-hint --- .../interfaces/result/class_SearchableResult.php | 2 +- inc/classes/main/class_BaseFrameworkSystem.php | 10 +++++----- inc/classes/main/result/class_DatabaseResult.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/classes/interfaces/result/class_SearchableResult.php b/inc/classes/interfaces/result/class_SearchableResult.php index 7e453f14..e6029a5b 100644 --- a/inc/classes/interfaces/result/class_SearchableResult.php +++ b/inc/classes/interfaces/result/class_SearchableResult.php @@ -37,7 +37,7 @@ interface SearchableResult extends FrameworkInterface { * @para $callBack Call-back object for setting the index * @return void */ - function solveResultIndex ($databaseColumn, BaseDatabaseWrapper $wrapperInstance, array $callBack); + function solveResultIndex ($databaseColumn, DatabaseWrapper $wrapperInstance, array $callBack); } // [EOF] diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index b34a1b24..2ff1eb53 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -997,19 +997,19 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } /** - * Setter for BaseDatabaseWrapper instance + * Setter for DatabaseWrapper instance * - * @param $wrapperInstance An instance of an BaseDatabaseWrapper + * @param $wrapperInstance An instance of an DatabaseWrapper * @return void */ - public final function setWrapperInstance (BaseDatabaseWrapper $wrapperInstance) { + public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) { $this->wrapperInstance = $wrapperInstance; } /** - * Getter for BaseDatabaseWrapper instance + * Getter for DatabaseWrapper instance * - * @return $wrapperInstance An instance of an BaseDatabaseWrapper + * @return $wrapperInstance An instance of an DatabaseWrapper */ public final function getWrapperInstance () { return $this->wrapperInstance; diff --git a/inc/classes/main/result/class_DatabaseResult.php b/inc/classes/main/result/class_DatabaseResult.php index 0fc85cd1..dd215939 100644 --- a/inc/classes/main/result/class_DatabaseResult.php +++ b/inc/classes/main/result/class_DatabaseResult.php @@ -381,7 +381,7 @@ class DatabaseResult extends BaseFrameworkSystem implements SearchableResult, Up * @return void * @todo Find a caching way without modifying the result array */ - public function solveResultIndex ($databaseColumn, BaseDatabaseWrapper $wrapperInstance, array $callBack) { + public function solveResultIndex ($databaseColumn, DatabaseWrapper $wrapperInstance, array $callBack) { // By default nothing is found $indexValue = 0; -- 2.30.2