diff --git a/.phive/phars.xml b/.phive/phars.xml index 4705afd..72b47dc 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -3,7 +3,7 @@ - - + + diff --git a/src/Combined/DateTime.php b/src/Combined/DateTime.php index 50532a5..b4c5d65 100644 --- a/src/Combined/DateTime.php +++ b/src/Combined/DateTime.php @@ -385,7 +385,7 @@ class DateTime } else { $str = implode(', ', array_slice($formatted, 0, -1)); if (!empty($formatted[count($formatted) - 1])) { - $str .= ' and ' . $formatted[count($formatted) - 1]; + $str .= ' and ' . (string)array_pop($formatted); } return $negative . $str; } diff --git a/src/DB/IO.php b/src/DB/IO.php index aeccd67..35c81a5 100644 --- a/src/DB/IO.php +++ b/src/DB/IO.php @@ -1318,14 +1318,14 @@ class IO // regex for params: only stand alone $number allowed // exclude all '' enclosed strings, ignore all numbers [note must start with digit] // can have space/tab/new line - // must have = , ( [equal, comma, opening round bracket] + // must have <> = , ( [not equal, equal, comma, opening round bracket] // can have space/tab/new line // $ number with 1-9 for first and 0-9 for further digits // /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 preg_match_all( - '/(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s', + '/(?:\'.*?\')?\s*(?:\?\?|<>|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s', $query, $match ); diff --git a/tools/phpstan b/tools/phpstan index 71878da..0d01a2f 120000 --- a/tools/phpstan +++ b/tools/phpstan @@ -1 +1 @@ -/home/clemens/.phive/phars/phpstan-1.10.40.phar \ No newline at end of file +/home/clemens/.phive/phars/phpstan-1.10.46.phar \ No newline at end of file diff --git a/tools/psalm b/tools/psalm index 6355378..38c37c8 120000 --- a/tools/psalm +++ b/tools/psalm @@ -1 +1 @@ -/home/clemens/.phive/phars/psalm-5.15.0.phar \ No newline at end of file +/home/clemens/.phive/phars/psalm-5.16.0.phar \ No newline at end of file