Merge branch '6.x' of https://github.com/craftcms/feed-me into 6.x

Author: angrybrad

src/fields/CalendarEvents.php

@@ -8,7 +8,6 @@
 use craft\feedme\base\FieldInterface;
 use craft\feedme\helpers\DataHelper;
 use craft\feedme\Plugin;
-use craft\helpers\Db;
 use craft\helpers\Json;
 use Solspace\Calendar\Elements\Event as EventElement;
 
@@ -125,7 +124,8 @@ public function parseField(): mixed
             $criteria['status'] = null;
             $criteria['typeId'] = $typeIds;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/Categories.php

@@ -153,7 +153,8 @@ public function parseField(): mixed
 
             $criteria['status'] = null;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/CommerceProducts.php

@@ -129,7 +129,8 @@ public function parseField(): mixed
             $criteria['status'] = null;
             $criteria['typeId'] = $typeIds;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/CommerceVariants.php

@@ -10,7 +10,6 @@
 use craft\feedme\base\FieldInterface;
 use craft\feedme\helpers\DataHelper;
 use craft\feedme\Plugin;
-use craft\helpers\Db;
 use craft\helpers\Json;
 
 /**
@@ -129,7 +128,8 @@ public function parseField(): mixed
             $criteria['status'] = null;
             $criteria['typeId'] = $typeIds;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/DigitalProducts.php

@@ -9,7 +9,6 @@
 use craft\feedme\base\FieldInterface;
 use craft\feedme\helpers\DataHelper;
 use craft\feedme\Plugin;
-use craft\helpers\Db;
 use craft\helpers\Json;
 
 /**
@@ -130,7 +129,8 @@ public function parseField(): mixed
             $criteria['status'] = null;
             $criteria['typeId'] = $typeIds;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/Entries.php

@@ -169,7 +169,8 @@ public function parseField(): mixed
 
             $criteria['status'] = null;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/Tags.php

@@ -127,7 +127,8 @@ public function parseField(): mixed
             $criteria['status'] = null;
             $criteria['groupId'] = $groupId;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             Craft::configure($query, $criteria);
 

src/fields/Users.php

@@ -155,7 +155,8 @@ public function parseField(): mixed
             $ids = [];
             $criteria['status'] = null;
             $criteria['limit'] = $limit;
-            $criteria[$match] = Db::escapeParam($dataValue);
+            // prep the $dataValue for matching
+            $criteria[$match] = DataHelper::prepValueForElementMatch($dataValue);
 
             // If the only source for the Users field is "admins" we don't have to bother with this query.
             if (!($isAdmin && empty($groupIds) && empty($customSources))) {

src/helpers/DataHelper.php

@@ -355,6 +355,28 @@ public static function prepDatesForComparison(mixed $firstValue, mixed $secondVa
         return [$firstValue, $secondValue];
     }
 
+    /**
+     * Prepares given value for finding an element by it.
+     *
+     * @param mixed $value
+     * @return mixed
+     */
+    public static function prepValueForElementMatch(mixed $value): mixed
+    {
+        $value = Db::escapeParam($value);
+
+        // ensure that if the value is exactly "or" or "and" (case-insensitive), we escape it too
+        $operators = ['or', 'and'];
+        foreach ($operators as $operator) {
+            if (strcasecmp($value, $operator) === 0) {
+                $value = "=$value";
+                break;
+            }
+        }
+
+        return $value;
+    }
+
     /**
      * @param $array1
      * @param $array2