Use interface DatabaseWrapper instead of generic class BaseDatabaseWrapper as a typ...

diff --git a/inc/classes/interfaces/result/class_SearchableResult.php b/inc/classes/interfaces/result/class_SearchableResult.php
index 7e453f149ea00e79318b7071f9b72189f20816dd..e6029a5bcd994b80a696b1ee492703eab48268b4 100644 (file)
--- 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
         */
         * @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]
 }
 
 // [EOF]

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index b34a1b2426f5fab7da1bbd1bf28855c4468860ad..2ff1eb53fb4baa9a6ce21b427411c6dae3158d36 100644 (file)
--- 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
         */
         * @return      void
         */

-       public final function setWrapperInstance (BaseDatabaseWrapper $wrapperInstance) {
+       public final function setWrapperInstance (DatabaseWrapper $wrapperInstance) {

                $this->wrapperInstance = $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;
         */
        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 0fc85cd11befca1811b5efa19f41ce6869f6e945..dd2159395a56f349c991c4aba409ed1ca2bf1ef5 100644 (file)
--- 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
         */
         * @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;
 
                // By default nothing is found
                $indexValue = 0;