Clean up code.

- Fix lint - Remove unused code.
cakephp · Aug 7, 2016 · ba06adb · ba06adb
1 parent 4d1e37c
commit ba06adb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 54 deletions.
diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php
@@ -355,6 +355,7 @@ public function marshalPropertyMap($marshaller, $map, $options)
                     // match the original form data position.
                     $entity->errors($errors);
                 }
+
                 return $translations;
             }
         ];

diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -103,10 +103,12 @@ protected function _buildPropertyMap($data, $options)
             }
             $new = function ($value, $entity) use ($assoc, $nested) {
                 $options = $nested + ['associated' => []];
+
                 return $this->_marshalAssociation($assoc, $value, $options);
             };
             $merge = function ($value, $entity) use ($assoc, $nested) {
                 $options = $nested + ['associated' => []];
+
                 return $this->_mergeAssociation($entity->get($assoc->property()), $assoc, $value, $options);
             };
             $map[$assoc->property()] = isset($options['isMerge']) ? $merge : $new;
@@ -247,7 +249,7 @@ protected function _validate($data, $options, $isNew)
      */
     protected function _prepareDataAndOptions($data, $options)
     {
-        $options += ['validate' => true, 'translations' => true];
+        $options += ['validate' => true];
 
         $tableName = $this->_table->alias();
         if (isset($data[$tableName])) {
@@ -470,59 +472,6 @@ protected function _loadBelongsToMany($assoc, $ids)
         return $this->_loadAssociatedByIds($assoc, $ids);
     }
 
-    /**
-     * Call translation merge
-     *
-     * @param \Cake\Datasource\EntityInterface $original The original entity
-     * @param array $data key value list of languages with fields to be merged into the translate entity
-     * @param array $options list of options
-     * @return array
-     */
-    protected function _mergeTranslations($original, array $data, array $options = [])
-    {
-        $result = $this->_table->mergeTranslations($original, $data, $this, $options);
-
-        $errors = [];
-        if (is_array($result)) {
-            if ((bool)$result[1]) {
-                $errors['_translations'] = $result[1];
-            }
-            $result = $result[0];
-        }
-
-        return [$result, $errors];
-    }
-
-    /**
-     * Return if table contains translate behavior or we specificate to use via `translations` options.
-     *
-     * ### Options:
-     *
-     * - translations: Set to false to disable translations
-     *
-     * @param array $options List of options
-     * @return bool
-     */
-    protected function _hasTranslations(array $options = [])
-    {
-        return ($this->_table->behaviors()->hasMethod('mergeTranslations') && (bool)$options['translations']);
-    }
-
-    /**
-     * Add `_translations` field to `fieldList` $options if it's not present inside
-     *
-     * @param array $options List of options
-     * @return array
-     */
-    protected function _addTranslationsToFieldList(array $options = [])
-    {
-        if (!empty($options['fieldList']) && !in_array('_translations', $options['fieldList'])) {
-            array_push($options['fieldList'], '_translations');
-        }
-
-        return $options;
-    }
-
     /**
      * Merges `$data` into `$entity` and recursively does the same for each one of
      * the association names passed in `$options`. When merging associations, if an