From 72861afc30e458d5cd2e8993883a7a96fa4cca51 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 19 Dec 2022 18:19:46 -0500 Subject: [PATCH] Added declare strict_types. --- src/bootstrap/Exceptions_common_bool.php | 2 ++ src/bootstrap/auto_loader.php | 2 ++ src/bootstrap/common.php | 2 ++ src/bootstrap/errors.php | 2 ++ src/bootstrap/filter.php | 2 ++ src/bootstrap/requires.php | 2 ++ src/bootstrap/safer_io.php | 12 ++++++++- src/bootstrap/site_helper.php | 2 ++ src/bootstrap/validator.php | 26 ++++++++++--------- src/classes/api.php | 2 ++ src/classes/app.php | 2 ++ src/classes/arrays/common.php | 2 ++ src/classes/arrays/countries.php | 2 ++ src/classes/arrays/mimes.php | 2 ++ src/classes/arrays/mocking/address.php | 2 ++ src/classes/arrays/mocking/phone.php | 2 ++ src/classes/arrays/mocking/rnd_names.php | 2 ++ src/classes/arrays/shortn.php | 2 ++ src/classes/arrays/zipcodes.php | 2 ++ src/classes/assets.php | 7 ++++- src/classes/bb_code_parser.php | 2 ++ src/classes/console_app.php | 2 ++ .../contracts/http_request_options.php | 2 ++ src/classes/contracts/sessions_interface.php | 2 ++ src/classes/database/dummy_data.php | 2 ++ src/classes/database/help_load.php | 2 ++ src/classes/database/help_save.php | 2 ++ src/classes/database/paginate.php | 2 ++ src/classes/database/run_sql.php | 2 ++ src/classes/database/validation.php | 2 ++ src/classes/enum/app_environment.php | 2 ++ src/classes/enum/same_site.php | 2 ++ src/classes/exceptions/DB_Exception.php | 2 ++ src/classes/html.php | 10 +++++-- src/classes/html_document.php | 2 ++ src/classes/html_parser.php | 2 ++ src/classes/json.php | 2 ++ src/classes/loadall.php | 2 ++ src/classes/memory_usage.php | 2 ++ src/classes/page_not_found.php | 2 ++ src/classes/request.php | 2 ++ src/classes/router.php | 2 ++ src/classes/safer_sql.php | 2 ++ src/classes/security.php | 2 ++ src/classes/services/cache/file.php | 2 ++ src/classes/services/cache/redis_db.php | 2 ++ src/classes/services/emailer.php | 2 ++ src/classes/services/html_filter.php | 2 ++ .../http_requests/http_curl_request.php | 2 ++ src/classes/services/liquid_templates.php | 2 ++ src/classes/services/log.php | 2 ++ src/classes/services/obsolete/crypto.php | 2 ++ src/classes/services/obsolete/encryption.php | 2 ++ .../services/obsolete/http_socket_request.php | 2 ++ .../services/paragon_crypto/crypto.php | 2 ++ .../paragon_crypto/password_storage.php | 2 ++ .../paragon_crypto/sodium_storage.php | 2 ++ src/classes/services/sessions.php | 2 ++ .../services/sessions/file_sessions.php | 2 ++ .../services/sessions/redis_sessions.php | 2 ++ src/classes/services/simple_rest.php | 2 ++ src/classes/services/twilio.php | 2 ++ src/classes/session_management.php | 2 ++ src/classes/tag_matches.php | 2 ++ src/classes/time_zone_selection.php | 2 ++ src/classes/time_zones.php | 2 ++ src/classes/traits/csrf_token_functions.php | 2 ++ .../traits/session_hijacking_functions.php | 2 ++ src/classes/url_encode.php | 2 ++ src/classes/view.php | 2 ++ src/templates/dev_error.php | 2 ++ src/views/404.php | 2 ++ src/views/default/broken.php | 4 ++- src/views/errors.php | 2 ++ 74 files changed, 180 insertions(+), 17 deletions(-) diff --git a/src/bootstrap/Exceptions_common_bool.php b/src/bootstrap/Exceptions_common_bool.php index 69c35ab..7a874d4 100644 --- a/src/bootstrap/Exceptions_common_bool.php +++ b/src/bootstrap/Exceptions_common_bool.php @@ -1,5 +1,7 @@ * @site https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader-examples.md diff --git a/src/bootstrap/common.php b/src/bootstrap/common.php index 2b0c0f0..4a588fd 100644 --- a/src/bootstrap/common.php +++ b/src/bootstrap/common.php @@ -1,5 +1,7 @@ = $min; + return mb_strlen($data[$field]) >= intval($min); } - private static function is_max(array $data, string $field, int $max): bool { + private static function is_max(array $data, string $field, string $max): bool { if (!isset($data[$field])) { return true; } - return mb_strlen($data[$field]) <= $max; + return mb_strlen($data[$field]) <= intval($max); } - private static function is_greater_than(array $data, string $field, int $min): bool { + private static function is_greater_than(array $data, string $field, string $min): bool { if (!isset($data[$field])) { return true; } - return intval($data[$field]) > $min; + return intval($data[$field]) > intval($min); } - private static function is_less_than(array $data, string $field, int $max): bool { + private static function is_less_than(array $data, string $field, string $max): bool { if (!isset($data[$field])) { return true; } - return intval($data[$field]) < $max; + return intval($data[$field]) < intval($max); } - private static function is_number_range(array $data, string $field, int $min, int $max): bool { + private static function is_number_range(array $data, string $field, string $min, string $max): bool { if (!isset($data[$field])) { return true; } $no = intval($data[$field]); - return $no >= $min && $no <= $max; + return $no >= intval($min) && $no <= intval($max); } - private static function is_between(array $data, string $field, int $min, int $max): bool { + private static function is_between(array $data, string $field, string $min, string $max): bool { if (!isset($data[$field])) { return true; } $len = mb_strlen($data[$field]); - return $len >= $min && $len <= $max; + return $len >= intval($min) && $len <= intval($max); } private static function is_same(array $data, string $field, string $other): bool { diff --git a/src/classes/api.php b/src/classes/api.php index 97f5b51..c42a942 100644 --- a/src/classes/api.php +++ b/src/classes/api.php @@ -1,5 +1,7 @@ {$nl}"; foreach($db_field_names as $field_name) { - $td = $record[$field_name] ?? ""; - $cell = ($escape) ? \tts\safer_io::h($td) : $td; + $td = $record[$field_name] ?? ""; + if (is_string($td)) { + $cell = ($escape) ? \tts\safer_io::h($td) : $td; + } else { + $cell = (string) $td; + } echo "\t\t{$cell}{$nl}"; } echo "\t{$nl}"; diff --git a/src/classes/html_document.php b/src/classes/html_document.php index bc43c4b..b4f307a 100644 --- a/src/classes/html_document.php +++ b/src/classes/html_document.php @@ -1,5 +1,7 @@ - + diff --git a/src/views/errors.php b/src/views/errors.php index 626a571..f1f2b61 100644 --- a/src/views/errors.php +++ b/src/views/errors.php @@ -1,4 +1,6 @@