fixed enum validation, fixed property conflict in lookup strategy, fi…

…xed migration
CakeDC · Jan 6, 2025 · 49b74e2 · 49b74e2
1 parent 90dc3a7
commit 49b74e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/...ig/Migrations/001_create_enum_lookups.php → ...ions/20250104120000_CreateEnumLookups.php b/...ig/Migrations/001_create_enum_lookups.php → ...ions/20250104120000_CreateEnumLookups.php
diff --git a/src/Model/Behavior/EnumBehavior.php b/src/Model/Behavior/EnumBehavior.php
@@ -15,6 +15,7 @@
 
 use ArrayObject;
 use BadMethodCallException;
+use Cake\Datasource\EntityInterface;
 use Cake\Event\EventInterface;
 use Cake\ORM\Behavior;
 use Cake\ORM\Query\SelectQuery;
@@ -295,8 +296,14 @@ public function __call(string $method, array $args): bool
         if ($entity->isEmpty($config['field']) && Hash::get($config, 'allowEmpty') === true) {
             return true;
         }
+        $value = $entity->{$config['field']};
+        if (is_array($value)) {
+            $value = $value['value'] ?? '';
+        } elseif ($value instanceof EntityInterface) {
+            $value = $value->get('value');
+        }
 
-        return array_key_exists($entity->{$config['field']}, $this->enum($alias));
+        return array_key_exists($value, $this->enum($alias));
     }
 
     /**

diff --git a/src/Model/Behavior/Strategy/LookupStrategy.php b/src/Model/Behavior/Strategy/LookupStrategy.php
@@ -59,6 +59,7 @@ public function initialize(array $config): void
 
         $this->table
             ->belongsTo($assocName)
+            ->setProperty($assocName."Enum")
             ->setClassName('CakeDC/Enum.Lookups')
             ->setForeignKey($config['field'])
             ->setBindingKey('name')