Continued:

- moved $updateInstance and getter/setter to proper BaseDatabaseResult class
- renamed $class to $className
- removed __CLASS__ as default value from any abstract class' constructor

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 26d9392017b758c9ffcc571f3830204a3a5db6a5..0cfc19bb40e37307ca2940a7703c7fb80b4fd785 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -6,7 +6,6 @@ namespace Org\Mxchange\CoreFramework\Object;
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
 use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
-use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use Org\Mxchange\CoreFramework\Crypto\Cryptable;
 use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper;
 use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
@@ -83,11 +82,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         */
        private $searchInstance = NULL;
 
-       /**
-        * Update criteria instance
-        */
-       private $updateInstance = NULL;
-
        /**
         * Database result instance
         */
@@ -503,25 +497,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
                return $this->searchInstance;
        }
 
-       /**
-        * Setter for update instance
-        *
-        * @param       $updateInstance         An instance of a LocalUpdateCriteria clase
-        * @return      void
-        */
-       public final function setUpdateInstance (LocalUpdateCriteria $updateInstance) {
-               $this->updateInstance = $updateInstance;
-       }
-
-       /**
-        * Getter for update instance
-        *
-        * @return      $updateInstance         Updateable criteria instance
-        */
-       public final function getUpdateInstance () {
-               return $this->updateInstance;
-       }
-
        /**
         * Setter for debug instance
         *

diff --git a/framework/main/classes/database/class_BaseDatabaseResult.php b/framework/main/classes/database/class_BaseDatabaseResult.php
index 74b5d22887493e010c5459e903cb1ac002a8ad24..2b30e9e18371e4b40e30935a53e283ac9619fa8f 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseResult.php
+++ b/framework/main/classes/database/class_BaseDatabaseResult.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Result\Database;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
@@ -29,14 +30,38 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 abstract class BaseDatabaseResult extends BaseFrameworkSystem {
+       /**
+        * Update criteria instance
+        */
+       private $updateInstance = NULL;
+
        /**
         * Protected constructor
         *
         * @return      void
         */
-       protected function __construct($class = __CLASS__) {
+       protected function __construct (string $className) {
                // Call parent constructor
-               parent::__construct($class);
+               parent::__construct($className);
+       }
+
+       /**
+        * Setter for update instance
+        *
+        * @param       $updateInstance         An instance of a LocalUpdateCriteria clase
+        * @return      void
+        */
+       public final function setUpdateInstance (LocalUpdateCriteria $updateInstance) {
+               $this->updateInstance = $updateInstance;
+       }
+
+       /**
+        * Getter for update instance
+        *
+        * @return      $updateInstance         Updateable criteria instance
+        */
+       public final function getUpdateInstance () {
+               return $this->updateInstance;
        }
 
 }

diff --git a/framework/main/classes/database/migration/class_BaseDatabaseMigration.php b/framework/main/classes/database/migration/class_BaseDatabaseMigration.php
index ba23a172c5a5e7c601bdc6338a091eb613d85885..3f2acf077a92fa0820059684a5a2b7cb9998f732 100644 (file)
--- a/framework/main/classes/database/migration/class_BaseDatabaseMigration.php
+++ b/framework/main/classes/database/migration/class_BaseDatabaseMigration.php
@@ -33,9 +33,9 @@ abstract class BaseDatabaseMigration extends BaseFrameworkSystem {
         *
         * @return      void
         */
-       protected function __construct($class = __CLASS__) {
+       protected function __construct (string $className) {
                // Call parent constructor
-               parent::__construct($class);
+               parent::__construct($className);
        }
 
 }

diff --git a/framework/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php b/framework/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
index b5e1932a1952bdc9bb372ce346d627c21023c913..e7c2e4ef0aa0088cdaa899a562f06ffc3da5805b 100644 (file)
--- a/framework/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
+++ b/framework/main/classes/database/migration/format_upgrade/class_BaseFormatUpgrade.php
@@ -34,9 +34,9 @@ abstract class BaseFormatUpgrade extends BaseDatabaseMigration implements Migrat
         *
         * @return      void
         */
-       protected function __construct($class = __CLASS__) {
+       protected function __construct (string $className) {
                // Call parent constructor
-               parent::__construct($class);
+               parent::__construct($className);
        }
 
 }

diff --git a/framework/main/classes/database/result/class_CachedDatabaseResult.php b/framework/main/classes/database/result/class_CachedDatabaseResult.php
index 7f54df533e5e572f2c75869bb1f425ed744dc842..9f08757ba7d1dbdd85a93c4e0f7ea2695cf4d542 100644 (file)
--- a/framework/main/classes/database/result/class_CachedDatabaseResult.php
+++ b/framework/main/classes/database/result/class_CachedDatabaseResult.php
@@ -139,7 +139,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
 
                        // Mark it as out-dated
                        $this->outDated[$criteriaKey] = 1;
-               } // END - foreach
+               }
        }
 
        /**
@@ -158,7 +158,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                        $this->currentPos++;
                        $this->currentRow = $this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][$this->currentPos];
                        $nextValid = true;
-               } // END - if
+               }
 
                // Return the result
                return $nextValid;
@@ -178,7 +178,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                while (($this->currentPos < $index) && ($this->valid())) {
                        // Continue on
                        $this->next();
-               } // END - while
+               }
        }
 
        /**
@@ -194,7 +194,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                if (isset($this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][$this->currentPos])) {
                        // Then get it
                        $current = $this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][$this->currentPos];
-               } // END - if
+               }
 
                // Return the result
                return $current;
@@ -216,7 +216,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                if (($this->ifStatusIsOkay()) && (isset($this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][($this->currentPos + 1)])) && (isset($this->resultArray[BaseDatabaseBackend::RESULT_INDEX_ROWS][0]))) {
                        // All fine!
                        $isValid = true;
-               } // END - if
+               }
 
                // Return the result
                return $isValid;
@@ -289,7 +289,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                $searchInstance = $criteriaInstance->getSearchInstance();
 
                // And start looking for the result
-               $foundEntries = 0;
+               $foundEntries = $this->getAffectedRows();
                while (($this->valid()) && ($foundEntries < $searchInstance->getLimit())) {
                        // Get next entry
                        $this->next();
@@ -302,14 +302,14 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
 
                                // Count one up
                                $foundEntries++;
-                       } // END - if
-               } // END - while
+                       }
+               }
 
                // If no entry is found/updated throw an exception
                if ($foundEntries == 0) {
                        // Throw an exception here
                        throw new ResultUpdateException($this, self::EXCEPTION_RESULT_UPDATE_FAILED);
-               } // END - if
+               }
 
                // Set affected rows
                $this->setAffectedRows($foundEntries);
@@ -324,7 +324,7 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
         * @param       $rows   Number of affected rows
         * @return      void
         */
-       public final function setAffectedRows ($rows) {
+       public final function setAffectedRows (int $rows) {
                $this->affectedRows = $rows;
        }
 
@@ -370,8 +370,8 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
                        if ($this->find($key)) {
                                // Then update it
                                $criteriaInstance->addCriteria($key, $this->getFoundValue());
-                       } // END - if
-               } // END - foreach
+                       }
+               }
        }
 
        /**
@@ -405,8 +405,8 @@ class CachedDatabaseResult extends BaseDatabaseResult implements SearchableResul
 
                                // And stop searching
                                break;
-                       } // END - if
-               } // END - while
+                       }
+               }
 
                // Return the result
                return $found;

diff --git a/framework/main/exceptions/main/class_NullPointerException.php b/framework/main/exceptions/main/class_NullPointerException.php
index c3a1d02d89f73f1162ad859b0c2bc4adfd2744d3..e2e08781aadd40be1c2aa965bc8df860453a2bd2 100644 (file)
--- a/framework/main/exceptions/main/class_NullPointerException.php
+++ b/framework/main/exceptions/main/class_NullPointerException.php
@@ -36,7 +36,7 @@ class NullPointerException extends FrameworkException {
         * @param       $code   Code number for the exception
         * @return      void
         */
-       public function __construct (FrameworkInterface $class = NULL, $code) {
+       public function __construct (FrameworkInterface $class = NULL, int $code) {
                // Is the instance set?
                if (is_null($class)) {
                        // Add a message around the missing class