Added type-hint 'array' for $onlyKeys because this should only be an array.

Please report any problems related to this change!

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 1104fed5c6d265267c72bce2795128162a675711..79a60abeb3d09d1622ad580dfb3acf70541c9191 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -1945,7 +1945,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      $cacheKey                       A cache key suitable for lookup/storage purposes
         */
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      $cacheKey                       A cache key suitable for lookup/storage purposes
         */

-       protected function getCacheKeyByCriteria (Criteria $criteriaInstance, $onlyKeys = array()) {
+       protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) {

                // Generate it
                $cacheKey = sprintf("%s@%s",
                        $this->__toString(),
                // Generate it
                $cacheKey = sprintf("%s@%s",
                        $this->__toString(),

diff --git a/inc/classes/main/database/class_BaseDatabaseWrapper.php b/inc/classes/main/database/class_BaseDatabaseWrapper.php
index c26f945ebee31fc7589cf33695ad81b25e023c8e..1ca253c8fcff68d9c7a4719ccebe41d4540c59cb 100644 (file)
--- a/inc/classes/main/database/class_BaseDatabaseWrapper.php
+++ b/inc/classes/main/database/class_BaseDatabaseWrapper.php
@@ -81,7 +81,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      void
         */
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      void
         */

-       protected function queryInsertDataSet (StoreableCriteria $dataSetInstance, $onlyKeys = array()) {
+       protected function queryInsertDataSet (StoreableCriteria $dataSetInstance, array $onlyKeys = array()) {

                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                //* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                //* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');


@@ -103,7 +103,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      void
         */
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      void
         */

-       protected function queryUpdateDataSet (StoreableCriteria $dataSetInstance, $onlyKeys = array()) {
+       protected function queryUpdateDataSet (StoreableCriteria $dataSetInstance, array $onlyKeys = array()) {

                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                //* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');
                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($dataSetInstance, $onlyKeys);
                //* DEBUG: */ $this->debugOutput('BASE-WRAPPER: Using cache key ' . $cacheKey . ' for purging ...');


@@ -135,7 +135,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem {
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      $resultInstance         An instance of a database result class
         */
         * @param       $onlyKeys                       Only use these keys for a cache key
         * @return      $resultInstance         An instance of a database result class
         */

-       public function doSelectByCriteria (Criteria $criteriaInstance, $onlyKeys = array()) {
+       public function doSelectByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) {

                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($criteriaInstance, $onlyKeys);
 
                // First get a key suitable for our cache and extend it with this class name
                $cacheKey = $this->getCacheKeyByCriteria($criteriaInstance, $onlyKeys);
 

diff --git a/prop-set.sh b/prop-set.sh
index d37140bc6d6b837b96277585aeff2d6161ee4dba..8a3c22e95b492981fdeadc0be091494ccd6c4b6d 100755 (executable)
--- a/prop-set.sh
+++ b/prop-set.sh
@@ -40,3 +40,6 @@ for entry in ${DEL_EXECUTE}; do
        echo "$0: propdel svn:executable on *.${entry}"
        find -type f -name "*.${entry}" -exec svn propdel svn:executable {} \; 2>/dev/null
 done
        echo "$0: propdel svn:executable on *.${entry}"
        find -type f -name "*.${entry}" -exec svn propdel svn:executable {} \; 2>/dev/null
 done

+
+# Revert third-party classes
+svn --recursive revert inc/classes/third_party/