Merge remote-tracking branch 'upstream/develop' into 4.6

Author: kenjis

system/Database/BaseBuilder.php

@@ -3169,21 +3169,27 @@ protected function compileWhereHaving(string $qbKey): string
                 );
 
                 foreach ($conditions as &$condition) {
-                    if (($op = $this->getOperator($condition)) === false
-                        || ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
+                    $op = $this->getOperator($condition);
+                    if (
+                        $op === false
+                        || ! preg_match(
+                            '/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i',
+                            $condition,
+                            $matches
+                        )
                     ) {
                         continue;
                     }
-                    // $matches = array(
-                    //	0 => '(test <= foo)',	/* the whole thing */
-                    //	1 => '(',		/* optional */
-                    //	2 => 'test',		/* the field name */
-                    //	3 => ' <= ',		/* $op */
-                    //	4 => 'foo',		/* optional, if $op is e.g. 'IS NULL' */
-                    //	5 => ')'		/* optional */
-                    // );
-
-                    if (isset($matches[4]) && $matches[4] !== '' && $matches[4] !== '0') {
+                    // $matches = [
+                    //  0 => '(test <= foo)',   /* the whole thing */
+                    //  1 => '(',               /* optional */
+                    //  2 => 'test',            /* the field name */
+                    //  3 => ' <= ',            /* $op */
+                    //  4 => 'foo',	            /* optional, if $op is e.g. 'IS NULL' */
+                    //  5 => ')'                /* optional */
+                    // ];
+
+                    if (isset($matches[4]) && $matches[4] !== '') {
                         $protectIdentifiers = false;
                         if (str_contains($matches[4], '.')) {
                             $protectIdentifiers = true;

system/Router/Router.php

@@ -183,7 +183,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
     }
 
     /**
-     * Finds the controller method corresponding to the URI.
+     * Finds the controller corresponding to the URI.
      *
      * @param string|null $uri URI path relative to baseURL
      *
@@ -243,7 +243,7 @@ public function getFilters(): array
     }
 
     /**
-     * Returns the name of the matched controller.
+     * Returns the name of the matched controller or closure.
      *
      * @return (Closure(mixed...): (ResponseInterface|string|void))|string Controller classname or Closure
      */
@@ -256,7 +256,7 @@ public function controllerName()
 
     /**
      * Returns the name of the method to run in the
-     * chosen container.
+     * chosen controller.
      */
     public function methodName(): string
     {