HTML::htmlent and HTML::checked updates

Changed Params form ENT_COMPAT | ENT_HTML401 to ENT_QUOTES | ENT_HTML5 Flags can be overwritten on call Logic clean up for return flow HTML::checked gets logic updated with less nested ifs
Fix not closed <head> block in all admin test files
2024-08-05 13:24:37 +09:00 · 2024-08-05 12:53:48 +09:00 · 2024-07-29 16:30:48 +09:00 · 2024-07-29 15:55:38 +09:00 · 2024-07-19 18:40:24 +09:00
61 changed files with 111 additions and 86 deletions
--- a/.shellcheckrc
+++ b/.shellcheckrc
@@ -0,0 +1,2 @@
+shell=bash
+external-sources=true
--- a/4dev/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -12,7 +12,7 @@ if [ "${1}" = "t" ] || [ "${2}" = "t" ]; then
 	opt_testdox="--testdox";
 fi;
 php_bin="";
-if [ ! -z "${1}" ]; then
+if [ -n "${1}" ]; then
 	case "${1}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
 		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
@@ -23,7 +23,7 @@ if [ ! -z "${1}" ]; then
 		*) echo "Not support PHP: ${1}"; exit; ;;
 	esac;
 fi;
-if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
+if [ -n "${2}" ] && [ -z "${php_bin}" ]; then
 	case "${2}" in
 		# "7.3") php_bin="/usr/bin/php7.3 "; ;;
 		# "7.4") php_bin="/usr/bin/php7.4 "; ;;
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,7 +2,7 @@
 includes:
 	- phpstan-conditional.php
 parameters:
-	tmpDir: /tmp/phpstan-corelibs
+	tmpDir: %currentWorkingDirectory%/tmp/phpstan-corelibs
 	level: 8 # max is now 9
 	checkMissingCallableSignature: true
 	treatPhpDocTypesAsCertain: false
@@ -39,9 +39,9 @@ parameters:
 		- www/vendor
 	# ignore errores with
 	ignoreErrors:
-		# - # in the class_test tree we allow deprecated calls
-		# 	message: "#^Call to deprecated method #"
-		# 	path: %currentWorkingDirectory%/www/admin/class_test.*.php
+		- # in the class_test tree we allow deprecated calls
+			message: "#^Call to deprecated method #"
+			path: %currentWorkingDirectory%/www/admin/class_test.*.php
 		# - '#Expression in empty\(\) is always falsy.#'
 		# -
 		# 	message: '#Reflection error: [a-zA-Z0-9\\_]+ not found.#'
--- a/tmp/.gitignore
+++ b/tmp/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
--- a/www/admin/class_test.admin.backend.php
+++ b/www/admin/class_test.admin.backend.php
@@ -46,7 +46,7 @@ use CoreLibs\Debug\Support;

 $PAGE_NAME = 'TEST CLASS: ADMIN BACKEND';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.array.php
+++ b/www/admin/class_test.array.php
@@ -21,7 +21,7 @@ ob_end_flush();
 use CoreLibs\Combined\ArrayHandler;
 use CoreLibs\Debug\Support as DgS;
 use CoreLibs\Convert\SetVarType;
-use PHPUnit\Framework\Constraint\ArrayHasKey;
+// use PHPUnit\Framework\Constraint\ArrayHasKey;

 $log = new CoreLibs\Logging\Logging([
 	'log_folder' => BASE . LOG,
@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: ARRAY HANDLER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.autoloader.php
+++ b/www/admin/class_test.autoloader.php
@@ -23,7 +23,7 @@ use CoreLibs\Convert\Byte;

 $PAGE_NAME = 'TEST CLASS: AUTOLOADER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.byte.php
+++ b/www/admin/class_test.byte.php
@@ -29,7 +29,7 @@ $byte_class = 'CoreLibs\Convert\Byte';

 $PAGE_NAME = 'TEST CLASS: BYTE CONVERT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.check.colors.php
+++ b/www/admin/class_test.check.colors.php
@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CHECK COLORS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.class-calls.php
+++ b/www/admin/class_test.class-calls.php
@@ -28,7 +28,7 @@ $db = new CoreLibs\DB\IO(DB_CONFIG, $log);

 $PAGE_NAME = 'TEST CLASS: CLASS CALLS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.config.direct.php
+++ b/www/admin/class_test.config.direct.php
@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CONFIG DIRECT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.config.link.php
+++ b/www/admin/class_test.config.link.php
@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CONFIG LINK';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.convert.colors.php
+++ b/www/admin/class_test.convert.colors.php
@@ -31,7 +31,7 @@ $color_class = 'CoreLibs\Convert\Colors';

 $PAGE_NAME = 'TEST CLASS: CONVERT COLORS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.create_email.php
+++ b/www/admin/class_test.create_email.php
@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CREATE EMAIL';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.datetime.php
+++ b/www/admin/class_test.datetime.php
@@ -30,7 +30,7 @@ $datetime_class = 'CoreLibs\Combined\DateTime';

 $PAGE_NAME = 'TEST CLASS: DATE/TIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -451,6 +451,7 @@ function intervalStringFormatDeprecated(
 			$value = $interval->days;
 			$skip = true;
 		} else {
+			/** @phan-suppress-next-line PhanUndeclaredProperty */
 			$value = $interval->$part;
 		}
 		if ($value == 0 && $skip_last_zero === true) {
--- a/www/admin/class_test.db.dbReturn.php
+++ b/www/admin/class_test.db.dbReturn.php
@@ -34,7 +34,7 @@ $db->log->debug('START', '=============================>');

 $PAGE_NAME = 'TEST CLASS: DB dbReturn';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><a href="class_test.db.php">Class Test DB</a></div>';
--- a/www/admin/class_test.db.php
+++ b/www/admin/class_test.db.php
@@ -35,7 +35,7 @@ $db->log->debug('START', '=============================>');

 $PAGE_NAME = 'TEST CLASS: DB';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><a href="class_test.db.type.php">Class Test DB row type convert to PHP type</a></div>';
--- a/www/admin/class_test.db.query-placeholder.php
+++ b/www/admin/class_test.db.query-placeholder.php
@@ -20,7 +20,7 @@ $LOG_FILE_ID = 'classTest-db-query-placeholder';
 ob_end_flush();

 use CoreLibs\Debug\Support;
-use CoreLibs\DB\Support\ConvertPlaceholder;
+// use CoreLibs\DB\Support\ConvertPlaceholder;

 $log = new CoreLibs\Logging\Logging([
 	'log_folder' => BASE . LOG,
@@ -33,7 +33,7 @@ $db->log->debug('START', '=============================>');

 $PAGE_NAME = 'TEST CLASS: DB QUERY PLACEHOLDER';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.db.single.php
+++ b/www/admin/class_test.db.single.php
@@ -19,7 +19,7 @@ require 'config.php';
 $LOG_FILE_ID = 'classTest-db-query-placeholders';
 ob_end_flush();

-use CoreLibs\Debug\Support;
+// use CoreLibs\Debug\Support;

 $log = new CoreLibs\Logging\Logging([
 	'log_folder' => BASE . LOG,
@@ -32,7 +32,7 @@ $db->log->debug('START', '=============================>');

 $PAGE_NAME = 'TEST CLASS: DB QUERY PLACEHOLDERS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.db.types.php
+++ b/www/admin/class_test.db.types.php
@@ -33,7 +33,7 @@ $db->log->debug('START', '=============================>');

 $PAGE_NAME = 'TEST CLASS: DB COLUMN TYPES';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.debug.php
+++ b/www/admin/class_test.debug.php
@@ -43,7 +43,7 @@ $debug_logging_class = 'CoreLibs\Debug\LoggingLegacy';

 $PAGE_NAME = 'TEST CLASS: DEBUG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.email.php
+++ b/www/admin/class_test.email.php
@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.encoding.php
+++ b/www/admin/class_test.encoding.php
@@ -35,7 +35,7 @@ $chk_enc = 'CoreLibs\Check\Encoding';

 $PAGE_NAME = 'TEST CLASS: ENCODING (CHECK/CONVERT/MIME)';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.encryption.php
+++ b/www/admin/class_test.encryption.php
@@ -31,7 +31,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: ENCRYPTION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.error_msg.php
+++ b/www/admin/class_test.error_msg.php
@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: ERROR MSG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.file.php
+++ b/www/admin/class_test.file.php
@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: FILE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.hash.php
+++ b/www/admin/class_test.hash.php
@@ -31,7 +31,7 @@ $hash_class = 'CoreLibs\Create\Hash';

 $PAGE_NAME = 'TEST CLASS: HASH';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.html.php
+++ b/www/admin/class_test.html.php
@@ -35,19 +35,20 @@ $elements_class = 'CoreLibs\Output\Form\Elements';

 $PAGE_NAME = 'TEST CLASS: HTML/ELEMENTS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';

-$string = "Something < = > Other <br> Next line";
-print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . "<br>";
+$string = "Something < = > Other <br> Next line and Quotes '\"";
+echo "String: <pre>$string</pre><br>";
+print "HTMLENT: " . Html::htmlent($string) . ": " . $_html->htmlent($string) . " (" . htmlentities($string) . ")<br>";
 print "REMOVELB: " . Html::htmlent($string) . ": " . $_html->removeLB($string) . "<br>";
 $date_str = [2021, 5, 1, 11, 10];
 print "PRINTDATETIME: "
 	. $_elements->printDateTime($date_str[0], $date_str[1], $date_str[2], $date_str[3], $date_str[4]) . "<br>";
 // STATIC
-$string = "Something < = > Other <br> Next line";
+// $string = "Something < = > Other <br> Next line and Quotes '\"";
 print "S::HTMLENT: " . Html::htmlent($string) . ": " . $html_class::htmlent($string) . "<br>";
 print "S::REMOVELB: " . Html::htmlent($string) . ": " . $html_class::removeLB($string) . "<br>";
 $date_str = [2021, 5, 1, 11, 10];
@@ -67,8 +68,10 @@ $checked_list = [
 	['foo', ['bar']],
 ];
 foreach ($checked_list as $check) {
-	print "CHECKED(0): $check[0]: " . Html::checked($check[1], $check[0]) . "<br>";
-	print "CHECKED(1): $check[0]: " . Html::checked($check[1], $check[0], Html::CHECKED) . "<br>";
+	print "CHECKED(0): " . $check[0] . " -> " . print_r($check[1], true) . ": "
+		. Html::checked($check[1], $check[0]) . "<br>";
+	print "CHECKED(1): " . $check[0] . " -> " . print_r($check[1], true) . ": "
+		. Html::checked($check[1], $check[0], Html::CHECKED) . "<br>";
 }

 // magic link creation test
--- a/www/admin/class_test.html_build.block.php
+++ b/www/admin/class_test.html_build.block.php
@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: HTML BUILD: BLOCK';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.html_build.element.php
+++ b/www/admin/class_test.html_build.element.php
@@ -33,7 +33,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: HTML BUILD';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.html_build.replace.php
+++ b/www/admin/class_test.html_build.replace.php
@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: HTML BUILD: STRING REPLACE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.image.php
+++ b/www/admin/class_test.image.php
@@ -32,7 +32,7 @@ $image_class = 'CoreLibs\Output\Image';

 $PAGE_NAME = 'TEST CLASS: IMAGE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.json.php
+++ b/www/admin/class_test.json.php
@@ -32,7 +32,7 @@ $json_class = 'CoreLibs\Convert\Json';

 $PAGE_NAME = 'TEST CLASS: JSON';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.lang.php
+++ b/www/admin/class_test.lang.php
@@ -20,7 +20,7 @@ ob_end_flush();

 $PAGE_NAME = 'TEST CLASS: LANG';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.logging.php
+++ b/www/admin/class_test.logging.php
@@ -38,7 +38,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: LOGGING';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.login.php
+++ b/www/admin/class_test.login.php
@@ -44,7 +44,7 @@ $login->loginMainCall();

 $PAGE_NAME = 'TEST CLASS: LOGIN';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.math.php
+++ b/www/admin/class_test.math.php
@@ -30,7 +30,7 @@ $math_class = 'CoreLibs\Convert\Math';

 $PAGE_NAME = 'TEST CLASS: MATH';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.memoryusage.php
+++ b/www/admin/class_test.memoryusage.php
@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: MEMORY USAGE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.mime.php
+++ b/www/admin/class_test.mime.php
@@ -27,7 +27,7 @@ $_mime = new CoreLibs\Convert\MimeAppName();

 $PAGE_NAME = 'TEST CLASS: MIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.output.form.php
+++ b/www/admin/class_test.output.form.php
@@ -74,7 +74,7 @@ $form = new CoreLibs\Output\Form\Generate(

 $PAGE_NAME = 'TEST CLASS: FORM GENERATE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.password.php
+++ b/www/admin/class_test.password.php
@@ -32,7 +32,7 @@ $password_class = 'CoreLibs\Security\Password';

 $PAGE_NAME = 'TEST CLASS: PASSWORD';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.php
+++ b/www/admin/class_test.php
@@ -63,7 +63,7 @@ $backend->db->dbInfo(true);
 ob_end_flush();

 print "<!DOCTYPE html>";
-print "<html><head><title>TEST CLASS</title><head>";
+print "<html><head><title>TEST CLASS</title></head>";
 print "<body>";

 // key: file name, value; name
--- a/www/admin/class_test.phpv.php
+++ b/www/admin/class_test.phpv.php
@@ -32,7 +32,7 @@ $phpv_class = 'CoreLibs\Check\PhpVersion';

 $PAGE_NAME = 'TEST CLASS: PHP VERSION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.randomkey.php
+++ b/www/admin/class_test.randomkey.php
@@ -29,7 +29,7 @@ $array_class = 'CoreLibs\Create\RandomKey';

 $PAGE_NAME = 'TEST CLASS: RANDOM KEY';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.readenvfile.php
+++ b/www/admin/class_test.readenvfile.php
@@ -27,7 +27,7 @@ $ref_class = 'CoreLibs\Get\ReadEnvFile';

 $PAGE_NAME = 'TEST CLASS: READ ENV FILE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.runningtime.php
+++ b/www/admin/class_test.runningtime.php
@@ -28,7 +28,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: RUNNING TIME';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.session.php
+++ b/www/admin/class_test.session.php
@@ -50,7 +50,7 @@ $session = new Session();

 $PAGE_NAME = 'TEST CLASS: SESSION';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.session.read.php
+++ b/www/admin/class_test.session.read.php
@@ -50,7 +50,7 @@ $session = new Session();

 $PAGE_NAME = 'TEST CLASS: SESSION (READ)';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.smarty.php
+++ b/www/admin/class_test.smarty.php
@@ -47,7 +47,7 @@ $adm->DATA['adm_set'] = 'SET from admin class';

 $PAGE_NAME = 'TEST CLASS: SMARTY';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
@@ -97,7 +97,7 @@ $smarty->DATA['drop_down_test'] = [
 	'foobar' => 'Foo Bar',
 ];
 $smarty->DATA['drop_down_test_selected'] = 'bar';
-$smarty->DATA['drop_down_test_nested']  = [
+$smarty->DATA['drop_down_test_nested'] = [
 	'' => '選択してください',
 	'4/25(木)' => [
 		'4/25(木) 11:00-11:50' => '4/25(木) 11:00-11:50',
--- a/www/admin/class_test.strings.php
+++ b/www/admin/class_test.strings.php
@@ -23,7 +23,7 @@ $byte_class = 'CoreLibs\Convert\Strings';

 $PAGE_NAME = 'TEST CLASS: STRINGS CONVERT';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.system.php
+++ b/www/admin/class_test.system.php
@@ -29,7 +29,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: SYSTEM';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.token.php
+++ b/www/admin/class_test.token.php
@@ -28,7 +28,7 @@ $token_class = 'CoreLibs\Output\Form\Token';

 $PAGE_NAME = 'TEST CLASS: FORM TOKEN';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.uids.php
+++ b/www/admin/class_test.uids.php
@@ -29,7 +29,7 @@ $uids_class = 'CoreLibs\Create\Uids';

 $PAGE_NAME = 'TEST CLASS: UIDS';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/class_test.varistype.php
+++ b/www/admin/class_test.varistype.php
@@ -30,7 +30,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CONVERT\VARISTYPE';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/subfolder/class_test.config.direct.php
+++ b/www/admin/subfolder/class_test.config.direct.php
@@ -26,7 +26,7 @@ $log = new CoreLibs\Logging\Logging([

 $PAGE_NAME = 'TEST CLASS: CONFIG DIRECT SUB';
 print "<!DOCTYPE html>";
-print "<html><head><title>" . $PAGE_NAME . "</title><head>";
+print "<html><head><title>" . $PAGE_NAME . "</title></head>";
 print "<body>";
 print '<div><a href="../class_test.php">Class Test Master</a></div>';
 print '<div><h1>' . $PAGE_NAME . '</h1></div>';
--- a/www/admin/test_edit_base.php
+++ b/www/admin/test_edit_base.php
@@ -47,7 +47,7 @@ $l10n = new \CoreLibs\Language\L10n(
 );

 print "<!DOCTYPE html>";
-print "<html><head><title>GROUP TESTER</title><head>";
+print "<html><head><title>GROUP TESTER</title></head>";
 print "<body>";

 print '<form method="post" name="loginlogout">';
--- a/www/lib/CoreLibs/Convert/Html.php
+++ b/www/lib/CoreLibs/Convert/Html.php
@@ -16,16 +16,22 @@ class Html
 	/**
 	 * full wrapper for html entities
 	 *
+	 * uses default params as: ENT_QUOTES | ENT_HTML5
+	 * switches from ENT_HTML401 to ENT_HTML5 as we assume all our pages have <!DOCTYPE html>
+	 * removed: ENT_SUBSTITUTE -> wrong characters will be replaced with space
+	 * encodes in UTF-8
+	 * does not double encode
+	 *
 	 * @param  mixed $string string to html encode
+	 * @param  int   $flags [default: ENT_QUOTES | ENT_HTML5]
 	 * @return mixed         if string, encoded, else as is (eg null)
 	 */
-	public static function htmlent(mixed $string): mixed
+	public static function htmlent(mixed $string, int $flags = ENT_QUOTES | ENT_HTML5): mixed
 	{
 		if (is_string($string)) {
-			return htmlentities($string, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		} else {
-			return $string;
+			return htmlentities($string, $flags, 'UTF-8', false);
 		}
+		return $string;
 	}

 	/**
@@ -54,14 +60,10 @@ class Html
 	 */
 	public static function checked(array|string $haystack, string $needle, int $type = 0): ?string
 	{
-		if (is_array($haystack)) {
-			if (in_array($needle, $haystack)) {
-				return $type ? 'checked' : 'selected';
-			}
-		} else {
-			if ($haystack == $needle) {
-				return $type ? 'checked' : 'selected';
-			}
+		if (is_array($haystack) && in_array($needle, $haystack)) {
+			return $type ? 'checked' : 'selected';
+		} elseif (!is_array($haystack) && $haystack == $needle) {
+			return $type ? 'checked' : 'selected';
 		}
 		return null;
 	}
--- a/www/lib/CoreLibs/DB/IO.php
+++ b/www/lib/CoreLibs/DB/IO.php
@@ -1324,8 +1324,12 @@ class IO
 		// /s for matching new line in . list
 		// [disabled, we don't used ^ or $] /m for multi line match
 		// Matches in 1:, must be array_filtered to remove empty, count with array_unique
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
 		preg_match_all(
-			'/(?:\'.*?\')?\s*(?:\?\?|<>|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s',
+			'/'
+			. '(?:\'.*?\')?\s*(?:\?\?|<>|' . $query_split . ')\s*'
+			. '(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
+			. '/s',
 			$query,
 			$match
 		);
--- a/www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php
+++ b/www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php
@@ -39,9 +39,11 @@ class ConvertPlaceholder
 	): array {
 		$convert_to = strtolower($convert_to);
 		$matches = [];
+		$query_split = '[(=,?-]|->|->>|#>|#>>|@>|<@|\?\|\?\&|\|\||#-';
 		$pattern = '/'
 			// prefix string part, must match towards
-			. '(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*'
+			// seperator for ( = , ? - [and json/jsonb in pg doc section 9.15]
+			. '(?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*'
 			// match for replace part
 			. '(?:'
 			// digit -> ignore
@@ -96,7 +98,10 @@ class ConvertPlaceholder
 			$type = 'named';
 			$matches_return = $named_matches;
 			// only check for :named
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(:\w+))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(:\w+))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set
@@ -134,7 +139,10 @@ class ConvertPlaceholder
 			// order and data stays the same
 			$params_new = $params;
 			// only check for ?
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(?:(?:\?\?)?\s*(\?{1})))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set
@@ -163,7 +171,10 @@ class ConvertPlaceholder
 			$type = 'numbered';
 			$matches_return = $numbered_matches;
 			// only check for $n
-			$pattern_replace = '/((?:\'.*?\')?\s*(?:\?\?|[(=,])\s*)(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s';
+			$pattern_replace = '/'
+				. '((?:\'.*?\')?\s*(?:\?\?|' . $query_split . ')\s*)'
+				. '(\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))'
+				. '/s';
 			// 0: full
 			// 1: pre part
 			// 2: keep part UNLESS '3' is set
--- a/www/lib/CoreLibs/Language/Core/CachedFileReader.php
+++ b/www/lib/CoreLibs/Language/Core/CachedFileReader.php
@@ -46,7 +46,7 @@ class CachedFileReader extends \CoreLibs\Language\Core\StringReader
 			if (!is_resource($fd)) {
 				$this->error = 3; // Cannot read file, probably permissions
 			} else {
-				$this->fd_str = fread($fd, filesize($filename) ?: 0) ?: '';
+				$this->fd_str = fread($fd, filesize($filename) ?: 1) ?: '';
 				fclose($fd);
 			}
 		} else {
--- a/www/lib/CoreLibs/Template/SmartyExtend.php
+++ b/www/lib/CoreLibs/Template/SmartyExtend.php
@@ -185,7 +185,7 @@ class SmartyExtend extends \Smarty
 		// call basic smarty
 		// or Smarty::__construct();
 		parent::__construct();
-		// iinit lang
+		// init lang
 		$this->l10n = $l10n;
 		// parse and read, legacy stuff
 		$locale = $this->l10n->getLocaleAsArray();
Author	SHA1	Message	Date
Clemens Schwaighofer	aa2b60973e	HTML::htmlent and HTML::checked updates Changed Params form ENT_COMPAT \| ENT_HTML401 to ENT_QUOTES \| ENT_HTML5 Flags can be overwritten on call Logic clean up for return flow HTML::checked gets logic updated with less nested ifs	2024-08-05 13:24:37 +09:00
Clemens Schwaighofer	554dd5f73c	Fix not closed <head> block in all admin test files	2024-08-05 12:53:48 +09:00
Clemens Schwaighofer	e6f9559fbb	DB IO: placeholder fix for JSON/JSONB lists	2024-07-29 16:30:48 +09:00
Clemens Schwaighofer	770d6f30a4	DB\IO Placeholder regex fix for json queries, test data updates Some doc typo fixes test updates with remove of not used sub calls DB IO Placeholder regex now checks for any JSON/JSONB operators	2024-07-29 15:55:38 +09:00
Clemens Schwaighofer	f94f6cbe87	Add .shellcheckrc, move phpstan tmp folder to repository temp folder	2024-07-19 18:40:24 +09:00