Merge pull request #12963 from cakephp/master-docs

Added missing mixin for QueryExpression.

src/Database/Expression/QueryExpression.php

@@ -25,6 +25,9 @@ use Countable;
  * Represents a SQL Query expression. Internally it stores a tree of
  * expressions that can be compiled by converting this object to string
  * and will contain a correctly parenthesized and nested expression.
+ *
+ * @method $this and(callable|string|array|\Cake\Database\ExpressionInterface $conditions)
+ * @method $this or(callable|string|array|\Cake\Database\ExpressionInterface $conditions)
  */
 class QueryExpression implements ExpressionInterface, Countable
 {

src/Http/ServerRequest.php

@@ -1538,8 +1538,8 @@ class ServerRequest implements ArrayAccess, ServerRequestInterface
     protected function _parseAcceptWithQualifier($header)
     {
         $accept = [];
-        $header = explode(',', $header);
-        foreach (array_filter($header) as $value) {
+        $headers = explode(',', $header);
+        foreach (array_filter($headers) as $value) {
             $prefValue = '1.0';
             $value = trim($value);