Fix detection of unaliased identifiers

src/Model/Behavior/TrashBehavior.php

@@ -6,8 +6,7 @@
 use ArrayObject;
 use Cake\Core\Configure;
 use Cake\Core\Exception\CakeException;
-use Cake\Database\Expression\BetweenExpression;
-use Cake\Database\Expression\ComparisonExpression;
+use Cake\Database\Expression\FieldInterface;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\Expression\UnaryExpression;
@@ -184,41 +183,40 @@ public function beforeFind(EventInterface $event, SelectQuery $query, ArrayObjec
             return;
         }
 
-        $field = $this->getTrashField();
-
-        if ($this->shouldAddTrashCondition($query, $field)) {
-            $query->andWhere([$field . ' IS' => null]);
+        if ($this->shouldAddTrashCondition($query)) {
+            $query->andWhere([$this->getTrashField() . ' IS' => null]);
         }
     }
 
     /**
      * Whether we need to add the trash condition to the query
      *
      * @param \Cake\ORM\Query\SelectQuery $query Query.
-     * @param string $field Trash field
      * @return bool
      */
-    protected function shouldAddTrashCondition(SelectQuery $query, string $field): bool
+    protected function shouldAddTrashCondition(SelectQuery $query): bool
     {
+        $field = $this->getTrashField(false);
+        $fieldIdentifiers = [ $field, $this->table()->aliasField($field)];
         $addCondition = true;
 
-        $query->traverseExpressions(function ($expression) use (&$addCondition, $field): void {
-            if (!$addCondition) {
+        $query->traverseExpressions(function ($expression) use (&$addCondition, $fieldIdentifiers): void {
+            if ($addCondition === false) {
                 return;
             }
 
             if (
                 $expression instanceof IdentifierExpression
-                && $expression->getIdentifier() === $field
+                && in_array($expression->getIdentifier(), $fieldIdentifiers, true)
             ) {
                 $addCondition = false;
 
                 return;
             }
 
             if (
-                ($expression instanceof ComparisonExpression || $expression instanceof BetweenExpression)
-                && $expression->getField() === $field
+                $expression instanceof FieldInterface
+                && in_array($expression->getField(), $fieldIdentifiers, true)
             ) {
                 $addCondition = false;
             }

tests/TestCase/Model/Behavior/TrashBehaviorTest.php

@@ -361,6 +361,17 @@ public function testTrashNonAccessibleProperty()
         $this->assertCount(3, $this->Articles->find('withTrashed'));
     }
 
+    public function testFindWithImplicitCondition()
+    {
+        $this->assertCount(2, $this->Articles->find()->where([
+            'trashed IS NOT' => null,
+        ]));
+
+        $this->assertCount(2, $this->Articles->find()->where([
+            'Articles.trashed IS NOT' => null,
+        ]));
+    }
+
     /**
      * Test it can find only trashed records.
      *