Rename model to referenceName

While 'model' is the field name, as a config key it is quite meaningless without looking how it's used. Changed to reference name as, while not perfect, it's more descriptive than "model".
cakephp · Mar 1, 2015 · b151008 · b151008
1 parent 62cfe3c
commit b151008
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
@@ -74,7 +74,7 @@ class TranslateBehavior extends Behavior
         'fields' => [],
         'translationTable' => 'I18n',
         'defaultLocale' => '',
-        'model' => '',
+        'referenceName' => '',
         'allowEmptyTranslations' => true,
         'onlyTranslated' => false,
         'strategy' => 'subquery'
@@ -90,7 +90,7 @@ public function __construct(Table $table, array $config = [])
     {
         $config += [
             'defaultLocale' => I18n::defaultLocale(),
-            'model' => $table->alias()
+            'referenceName' => $table->alias()
         ];
         parent::__construct($table, $config);
     }
@@ -108,7 +108,7 @@ public function initialize(array $config)
         $this->setupFieldAssociations(
             $this->_config['fields'],
             $this->_config['translationTable'],
-            $this->_config['model'],
+            $this->_config['referenceName'],
             $this->_config['strategy']
         );
     }
@@ -268,7 +268,7 @@ public function beforeSave(Event $event, Entity $entity, ArrayObject $options)
         $fields = array_keys($values);
         $primaryKey = (array)$this->_table->primaryKey();
         $key = $entity->get(current($primaryKey));
-        $model = $this->_config['model'];
+        $model = $this->_config['referenceName'];
 
         $preexistent = $this->_translationTable->find()
             ->select(['id', 'field'])
@@ -480,7 +480,7 @@ protected function _bundleTranslatedFields($entity)
                 $contents[$i]->set('id', $results[$i], ['setter' => false]);
                 $contents[$i]->isNew(false);
             } else {
-                $translation['model'] = $this->_config['model'];
+                $translation['model'] = $this->_config['referenceName'];
                 $contents[$i]->set($translation, ['setter' => false, 'guard' => false]);
                 $contents[$i]->isNew(true);
             }

diff --git a/tests/TestCase/ORM/Behavior/TranslateBehaviorTest.php b/tests/TestCase/ORM/Behavior/TranslateBehaviorTest.php
@@ -899,7 +899,10 @@ public function testChangingModelFieldValue()
         $table = TableRegistry::get('Articles');
 
         $table->hasMany('OtherComments', ['className' => 'Comments']);
-        $table->OtherComments->addBehavior('Translate', ['fields' => ['comment'], 'model' => 'Comments']);
+        $table->OtherComments->addBehavior(
+            'Translate',
+            ['fields' => ['comment'], 'referenceName' => 'Comments']
+        );
 
         $items = $table->OtherComments->associations();
         $association = $items->getByProperty('comment_translation');