Refacuring:

[core.git] / framework / main / classes / class_BaseFrameworkSystem.php

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 43146fc0ed40eb52a157c56e72bc6ff0986d2731..274fb7d62f097c5ed7d8e1597d22444c722645ce 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -481,7 +481,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac
         * @param       $str    A string (maybe) without trailing slash
         * @return      $str    A string with an auto-appended trailing slash
         */
-       public final function addMissingTrailingSlash ($str) {
+       public final function addMissingTrailingSlash (string $str) {
                // Is there a trailing slash?
                if (substr($str, -1, 1) != '/') {
                        $str .= '/';
@@ -1053,7 +1053,7 @@ Loaded includes:
         * @param       $element        Element to check
         * @return      $isset          Whether the given key is set
         */
-       protected final function isGenericArrayElementSet ($keyGroup, $subGroup, $key, $element) {
+       protected final function isGenericArrayElementSet (string $keyGroup, string $subGroup, $key, $element) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element);
 
@@ -1071,7 +1071,7 @@ Loaded includes:
         * @param       $key            Key to check
         * @return      $isset          Whether the given key is set
         */
-       protected final function isGenericArrayKeySet ($keyGroup, $subGroup, $key) {
+       protected final function isGenericArrayKeySet (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1090,7 +1090,7 @@ Loaded includes:
         * @param       $subGroup       Sub group
         * @return      $isset          Whether the given group is set
         */
-       protected final function isGenericArrayGroupSet ($keyGroup, $subGroup) {
+       protected final function isGenericArrayGroupSet (string $keyGroup, string $subGroup) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup);
 
@@ -1108,7 +1108,7 @@ Loaded includes:
         * @param       $subGroup       Sub key group
         * @return      $array          An array with all array elements
         */
-       protected final function getGenericSubArray ($keyGroup, $subGroup) {
+       protected final function getGenericSubArray (string $keyGroup, string $subGroup) {
                // Is it there?
                if (!$this->isGenericArrayGroupSet($keyGroup, $subGroup)) {
                        // No, then abort here
@@ -1131,7 +1131,7 @@ Loaded includes:
         * @param       $key            Key to unset
         * @return      void
         */
-       protected final function unsetGenericArrayKey ($keyGroup, $subGroup, $key) {
+       protected final function unsetGenericArrayKey (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1148,7 +1148,7 @@ Loaded includes:
         * @param       $element        Element to unset
         * @return      void
         */
-       protected final function unsetGenericArrayElement ($keyGroup, $subGroup, $key, $element) {
+       protected final function unsetGenericArrayElement (string $keyGroup, string $subGroup, $key, $element) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element);
 
@@ -1165,7 +1165,7 @@ Loaded includes:
         * @param       $value          Value to add/append
         * @return      void
         */
-       protected final function appendStringToGenericArrayKey ($keyGroup, $subGroup, $key, $value, $appendGlue = '') {
+       protected final function appendStringToGenericArrayKey (string $keyGroup, string $subGroup, $key, string $value, $appendGlue = '') {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',value[' . gettype($value) . ']=' . print_r($value, true) . ',appendGlue=' . $appendGlue);
 
@@ -1189,7 +1189,7 @@ Loaded includes:
         * @param       $value          Value to add/append
         * @return      void
         */
-       protected final function appendStringToGenericArrayElement ($keyGroup, $subGroup, $key, $element, $value, $appendGlue = '') {
+       protected final function appendStringToGenericArrayElement (string $keyGroup, string $subGroup, $key, $element, $value, $appendGlue = '') {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ',value[' . gettype($value) . ']=' . print_r($value, true) . ',appendGlue=' . $appendGlue);
 
@@ -1213,7 +1213,7 @@ Loaded includes:
         * @param       $value          Value to add/append
         * @return      void
         */
-       protected final function setStringGenericArrayElement ($keyGroup, $subGroup, $key, $element, $value, $appendGlue = '') {
+       protected final function setStringGenericArrayElement (string $keyGroup, string $subGroup, $key, $element, $value, $appendGlue = '') {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ',value[' . gettype($value) . ']=' . print_r($value, true) . ',appendGlue=' . $appendGlue);
 
@@ -1230,7 +1230,7 @@ Loaded includes:
         * @param       $forceInit      Optionally force initialization
         * @return      void
         */
-       protected final function initGenericArrayGroup ($keyGroup, $subGroup, $forceInit = false) {
+       protected final function initGenericArrayGroup (string $keyGroup, string $subGroup, bool $forceInit = false) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',forceInit=' . intval($forceInit));
 
@@ -1254,7 +1254,7 @@ Loaded includes:
         * @param       $forceInit      Optionally force initialization
         * @return      void
         */
-       protected final function initGenericArrayKey ($keyGroup, $subGroup, $key, $forceInit = false) {
+       protected final function initGenericArrayKey (string $keyGroup, string $subGroup, $key, bool $forceInit = false) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',forceInit=' . intval($forceInit));
 
@@ -1279,7 +1279,7 @@ Loaded includes:
         * @param       $forceInit      Optionally force initialization
         * @return      void
         */
-       protected final function initGenericArrayElement ($keyGroup, $subGroup, $key, $element, $forceInit = false) {
+       protected final function initGenericArrayElement (string $keyGroup, string $subGroup, $key, $element, bool $forceInit = false) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ',forceInit=' . intval($forceInit));
 
@@ -1303,7 +1303,7 @@ Loaded includes:
         * @param       $value          Value to add/append
         * @return      $count          Number of array elements
         */
-       protected final function pushValueToGenericArrayKey ($keyGroup, $subGroup, $key, $value) {
+       protected final function pushValueToGenericArrayKey (string $keyGroup, string $subGroup, $key, $value) {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',value[' . gettype($value) . ']=' . print_r($value, true));
 
@@ -1332,7 +1332,7 @@ Loaded includes:
         * @param       $value          Value to add/append
         * @return      $count          Number of array elements
         */
-       protected final function pushValueToGenericArrayElement ($keyGroup, $subGroup, $key, $element, $value) {
+       protected final function pushValueToGenericArrayElement (string $keyGroup, string $subGroup, $key, $element, $value) {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ',value[' . gettype($value) . ']=' . print_r($value, true));
 
@@ -1359,7 +1359,7 @@ Loaded includes:
         * @param       $key            Key to unset
         * @return      $value          Last "popped" value
         */
-       protected final function popGenericArrayElement ($keyGroup, $subGroup, $key) {
+       protected final function popGenericArrayElement (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1387,7 +1387,7 @@ Loaded includes:
         * @param       $key            Key to unset
         * @return      $value          Last "popped" value
         */
-       protected final function shiftGenericArrayElement ($keyGroup, $subGroup, $key) {
+       protected final function shiftGenericArrayElement (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1441,7 +1441,7 @@ Loaded includes:
         * @param       $subGroup       Sub group for the key
         * @return      $count          Count of given group
         */
-       protected final function countGenericArrayGroup ($keyGroup, $subGroup) {
+       protected final function countGenericArrayGroup (string $keyGroup, string $subGroup) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup);
 
@@ -1470,7 +1470,7 @@ Loaded includes:
         * @para        $key            Key to count
         * @return      $count          Count of given key
         */
-       protected final function countGenericArrayElements ($keyGroup, $subGroup, $key) {
+       protected final function countGenericArrayElements (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1525,7 +1525,7 @@ Loaded includes:
         * @param       $value          Mixed value from generic array element
         * @return      void
         */
-       protected final function setGenericArrayKey ($keyGroup, $subGroup, $key, $value) {
+       protected final function setGenericArrayKey (string $keyGroup, string $subGroup, $key, $value) {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',value[' . gettype($value) . ']=' . print_r($value, true));
 
@@ -1541,7 +1541,7 @@ Loaded includes:
         * @param       $key            Key to unset
         * @return      $value          Mixed value from generic array element
         */
-       protected final function getGenericArrayKey ($keyGroup, $subGroup, $key) {
+       protected final function getGenericArrayKey (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);
 
@@ -1566,7 +1566,7 @@ Loaded includes:
         * @param       $value          Value to set
         * @return      void
         */
-       protected final function setGenericArrayElement ($keyGroup, $subGroup, $key, $element, $value) {
+       protected final function setGenericArrayElement (string $keyGroup, string $subGroup, $key, $element, $value) {
                // Debug message
                //* NOISY-DEBUG: */ if (!is_object($value)) $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element . ',value[' . gettype($value) . ']=' . print_r($value, true));
 
@@ -1583,7 +1583,7 @@ Loaded includes:
         * @param       $element        Element to look for
         * @return      $value          Mixed value from generic array element
         */
-       protected final function getGenericArrayElement ($keyGroup, $subGroup, $key, $element) {
+       protected final function getGenericArrayElement (string $keyGroup, string $subGroup, $key, $element) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ',element=' . $element);
 
@@ -1605,7 +1605,7 @@ Loaded includes:
         * @param       $subGroup       Sub group for the key
         * @return      $isValid        Whether given sub group is valid
         */
-       protected final function isValidGenericArrayGroup ($keyGroup, $subGroup) {
+       protected final function isValidGenericArrayGroup (string $keyGroup, string $subGroup) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup);
 
@@ -1624,7 +1624,7 @@ Loaded includes:
         * @param       $key            Key to check
         * @return      $isValid        Whether given sub group is valid
         */
-       protected final function isValidGenericArrayKey ($keyGroup, $subGroup, $key) {
+       protected final function isValidGenericArrayKey (string $keyGroup, string $subGroup, $key) {
                // Debug message
                //* NOISY-DEBUG: */ $this->outputLine('[' . __METHOD__ . ':' . __LINE__ . '] keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key);