HTML::htmlent and HTML::checked method updates

Release: v9.13.2
DB-IO fix for JSON/JSONB operators when checking for placeholders
2024-08-05 13:28:11 +09:00 · 2024-07-29 16:34:07 +09:00 · 2024-07-29 16:32:45 +09:00 · 2024-07-29 16:14:37 +09:00
3 changed files with 20 additions and 14 deletions
--- a/publish/last.published
+++ b/publish/last.published
@@ -1 +1 @@
-9.13.0
+9.13.2
--- a/src/Convert/Html.php
+++ b/src/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/src/DB/IO.php
+++ b/src/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
 		);
Author	SHA1	Message	Date
Clemens Schwaighofer	89a4b4cf3e	HTML::htmlent and HTML::checked method updates	2024-08-05 13:28:11 +09:00
Clemens Schwaighofer	3eb1229590	Release: v9.13.2	2024-07-29 16:34:07 +09:00
Clemens Schwaighofer	f174e9ec34	DB-IO fix for JSON/JSONB operators when checking for placeholders	2024-07-29 16:32:45 +09:00
Clemens Schwaighofer	928369cff7	Release: v9.13.1	2024-07-29 16:14:37 +09:00
@@ -1 +1 @@
 .13.0
 .13.2