From 6305d3a9d677845ba03079483afb4756764cb42c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 4 Dec 2020 11:14:09 +0100 Subject: [PATCH] Continued: - added type-hints for primitive variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../classes/class_BaseFrameworkSystem.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index f1c3b49a..2585985a 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -497,7 +497,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac * @param $message Optional message to show in debug output * @return void */ - public final function debugInstance ($message = '') { + public final function debugInstance (string $message = '') { // Restore the error handler to avoid trouble with missing array elements or undeclared variables restore_error_handler(); @@ -544,7 +544,7 @@ Loaded includes: * @param $str String with control characters * @return $str Replaced string */ - protected function replaceControlCharacters ($str) { + protected function replaceControlCharacters (string $str) { // Replace them $str = str_replace( chr(13), '[r]', str_replace( @@ -563,7 +563,7 @@ Loaded includes: * @param $message An optional message to display * @return void */ - protected function partialStub ($message = '') { + protected function partialStub (string $message = '') { // Init variable $stubMessage = 'Partial stub!'; @@ -591,7 +591,7 @@ Loaded includes: * @param $doExit Whether exit the program (true is default) * @return void */ - public function debugBackTrace ($message = '', $doExit = true) { + public function debugBackTrace (string $message = '', bool $doExit = true) { // Sorry, there is no other way getting this nice backtrace if (!empty($message)) { // Output message @@ -616,7 +616,7 @@ Loaded includes: * @return $debugInstance An instance of a debugger class * @deprecated Not fully, as the new Logger facilities are not finished yet. */ - public final static function createDebugInstance ($className, $lineNumber = NULL) { + public final static function createDebugInstance (string $className, int $lineNumber = NULL) { // Is the instance set? if (!GenericRegistry::getRegistry()->instanceExists('debug')) { // Init debug instance @@ -651,7 +651,7 @@ Loaded includes: * @param $message Message to output * @return void */ - public function outputLine ($message) { + public function outputLine (string $message) { // Simply output it print($message . PHP_EOL); } @@ -666,7 +666,7 @@ Loaded includes: * @paran $stripTags Whether to strip tags (default: false) * @return void */ - public function debugOutput ($message, $doPrint = true, $stripTags = false) { + public function debugOutput (string $message, bool $doPrint = true, bool $stripTags = false) { // Set debug instance to NULL $debugInstance = NULL; @@ -733,7 +733,7 @@ Loaded includes: * @param $phpCode Unmarked PHP code * @return $markedCode Marked PHP code */ - public function markupCode ($phpCode) { + public function markupCode (string $phpCode) { // Init marked code $markedCode = ''; @@ -879,7 +879,7 @@ Loaded includes: * @return void * @todo Write a logging mechanism for productive mode */ - public function deprecationWarning ($message) { + public function deprecationWarning (string $message) { // Is developer mode active? if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('developer_mode_enabled')) { // Debug instance is there? @@ -903,7 +903,7 @@ Loaded includes: * @param $phpExtension The PHP extension we shall check * @return $isLoaded Whether the PHP extension is loaded */ - public final function isPhpExtensionLoaded ($phpExtension) { + public final function isPhpExtensionLoaded (string $phpExtension) { // Is it loaded? $isLoaded = in_array($phpExtension, get_loaded_extensions()); @@ -930,7 +930,7 @@ Loaded includes: * * @return $hasSlept Whether it goes fine */ - public function idle ($milliSeconds) { + public function idle (int $milliSeconds) { // Sleep is fine by default $hasSlept = true; @@ -959,7 +959,7 @@ Loaded includes: * @param $encodedData Encoded data we shall check * @return $isBase64 Whether the encoded data is Base64 */ - protected function isBase64Encoded ($encodedData) { + protected function isBase64Encoded (string $encodedData) { // Determine it $isBase64 = (@base64_decode($encodedData, true) !== false); @@ -1019,7 +1019,7 @@ Loaded includes: * @param $str The string to be hashed * @return $hash The hash from string $str */ - public static final function hash ($str) { + public static final function hash (string $str) { // Hash given string with (better secure) hasher $hash = bin2hex(mhash(MHASH_SHA256, $str)); -- 2.39.2