From 42842656e56e030851edf8a3546d2eef995c3b24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 22 Apr 2012 21:44:48 +0000 Subject: [PATCH] Added type-hint 'array' for $onlyKeys because this should only be an array. Please report any problems related to this change! --- inc/classes/main/class_BaseFrameworkSystem.php | 2 +- inc/classes/main/database/class_BaseDatabaseWrapper.php | 6 +++--- prop-set.sh | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 1104fed5..79a60abe 100644 --- 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 */ - protected function getCacheKeyByCriteria (Criteria $criteriaInstance, $onlyKeys = array()) { + protected function getCacheKeyByCriteria (Criteria $criteriaInstance, array $onlyKeys = array()) { // 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 c26f945e..1ca253c8 100644 --- 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 */ - 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 ...'); @@ -103,7 +103,7 @@ class BaseDatabaseWrapper extends BaseFrameworkSystem { * @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 ...'); @@ -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 */ - 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); diff --git a/prop-set.sh b/prop-set.sh index d37140bc..8a3c22e9 100755 --- 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 + +# Revert third-party classes +svn --recursive revert inc/classes/third_party/ -- 2.39.5