From 8e1ddcd05c5559b60939fd2bc4d4be7d03bfc9ec Mon Sep 17 00:00:00 2001 From: Patrick Conroy Date: Wed, 7 Jan 2015 15:54:51 -0500 Subject: [PATCH] Fixing psr-2 and removing extra breaks --- src/ORM/Behavior/TranslateBehavior.php | 3 --- tests/test_app/TestApp/Model/Table/I18nTable.php | 1 - 2 files changed, 4 deletions(-) diff --git a/src/ORM/Behavior/TranslateBehavior.php b/src/ORM/Behavior/TranslateBehavior.php index 5ebc1de14e3..0f6beedae68 100644 --- a/src/ORM/Behavior/TranslateBehavior.php +++ b/src/ORM/Behavior/TranslateBehavior.php @@ -362,7 +362,6 @@ protected function _rowMapper($results, $locale) $name = $field . '_translation'; $translation = isset($row[$name]) ? $row[$name] : null; - if ($translation === null || $translation === false) { unset($row[$name]); continue; @@ -396,7 +395,6 @@ public function groupTranslations($results) { return $results->map(function ($row) { $translations = (array)$row->get('_i18n'); - $grouped = new Collection($translations); $result = []; @@ -413,7 +411,6 @@ public function groupTranslations($results) $row->set('_translations', $result, $options); unset($row['_i18n']); $row->clean(); - return $row; }); } diff --git a/tests/test_app/TestApp/Model/Table/I18nTable.php b/tests/test_app/TestApp/Model/Table/I18nTable.php index e94dc300041..d927d3cf7b0 100644 --- a/tests/test_app/TestApp/Model/Table/I18nTable.php +++ b/tests/test_app/TestApp/Model/Table/I18nTable.php @@ -29,5 +29,4 @@ public static function defaultConnectionName() { return 'custom_i18n_datasource'; } - }