Revert back "andWhere()" calls.

cakephp · Aug 22, 2017 · 16cd1c8 · 16cd1c8
1 parent dc0d384
commit 16cd1c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/Datasource/QueryInterface.php b/src/Datasource/QueryInterface.php
@@ -18,6 +18,7 @@
 /**
  * The basis for every query object
  *
+ * @method $this andWhere($conditions, $types = [])
  */
 interface QueryInterface
 {

diff --git a/src/ORM/Association.php b/src/ORM/Association.php
@@ -956,7 +956,7 @@ protected function _appendNotMatching($query, $options)
         $target = $this->_targetTable;
         if (!empty($options['negateMatch'])) {
             $primaryKey = $query->aliasFields((array)$target->getPrimaryKey(), $this->_name);
-            $query->where(function ($exp) use ($primaryKey) {
+            $query->andWhere(function ($exp) use ($primaryKey) {
                 array_map([$exp, 'isNull'], $primaryKey);
 
                 return $exp;

diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -510,7 +510,7 @@ protected function _appendNotMatching($query, $options)
         $subquery = $this->_appendJunctionJoin($subquery, $conditions);
 
         $query
-            ->where(function ($exp) use ($subquery, $conds) {
+            ->andWhere(function ($exp) use ($subquery, $conds) {
                 $identifiers = [];
                 foreach (array_keys($conds) as $field) {
                     $identifiers = new IdentifierExpression($field);