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 @@