fixed property conflict in lookup strategy, fixed migration

CakeDC · Jan 6, 2025 · e16ac85 · e16ac85
1 parent 7cb14e3
commit e16ac85
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* 2.2.2
+  * Fixed migration
+  * Fixed property conflict in lookup strategy
 * 2.2.1
   * Fix plugin name
 * 2.2.0

diff --git a/Docs/Documentation/Installation.md b/Docs/Documentation/Installation.md
@@ -6,14 +6,6 @@
 composer require cakedc/enum:dev-master
 ```
 
-## Creating Required Tables
-
-You need to run this command to create the table:
-
-```
-bin/cake migrations migrate -p CakeDC/Enum
-```
-
 ## Load the Plugin
 
 Ensure the Enum Plugin is loaded in your config/bootstrap.php file
@@ -24,4 +16,12 @@ Plugin::load('CakeDC/Enum');
 or
 ```php
 Plugin::loadAll();
-```
+```
+
+## Creating Required Tables
+
+You need to run this command to create the table:
+
+```
+bin/cake migrations migrate -p CakeDC/Enum
+```
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
     },
     "require": {
         "php": ">=7.3",
-        "cakephp/cakephp": "^4.0"
+        "cakephp/cakephp": "^4.0",
+        "cakephp/migrations": "^3.9"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",

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
@@ -1,5 +1,7 @@
 <?php
-use Phinx\Migration\AbstractMigration;
+declare(strict_types=1);
+
+use Migrations\AbstractMigration;
 
 class CreateEnumLookups extends AbstractMigration
 {

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