Merge pull request #428 from alexhampu/master

add enum processing when fetching values from where statements

Author: mikebronner

src/CacheKey.php

@@ -280,22 +280,18 @@ protected function getValuesFromWhere(array $where) : string
         }
 
         if (is_array((new Arr)->get($where, "values"))) {
-            return implode("_", collect($where["values"])->flatten()->toArray());
+            $values = collect($where["values"])->flatten()->toArray();
+            return implode("_", $this->processEnums($values));
         }
 
         if (is_array((new Arr)->get($where, "value"))) {
-            return implode("_", collect($where["value"])->flatten()->toArray());
+            $values = collect($where["value"])->flatten()->toArray();
+            return implode("_", $this->processEnums($values));
         }
 
         $value = (new Arr)->get($where, "value", "");
 
-        if ($value instanceof \BackedEnum) {
-            return $value->value;
-        } elseif ($value instanceof \UnitEnum) {
-            return $value->name;
-        }
-
-        return $value;
+        return $this->processEnum($value);
     }
 
     protected function getValuesFromBindings(array $where, string $values) : string
@@ -396,4 +392,20 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
 
         return $result;
     }
+
+    private function processEnum(\BackedEnum|\UnitEnum|string $value): string
+    {
+        if ($value instanceof \BackedEnum) {
+            return $value->value;
+        } elseif ($value instanceof \UnitEnum) {
+            return $value->name;
+        }
+
+        return $value;
+    }
+
+    private function processEnums(array $values): array
+    {
+        return array_map(fn($value) => $this->processEnum($value), $values);
+    }
 }