BAP-12113: Add functional test for command and entity repository

Mykhailo Sulyma · Mykhailo Sulyma · commit a499bf93a56e · 2016-11-03T13:38:04.000+02:00
- CR fixes
diff --git a/Tests/Unit/Tools/EnumSynchronizerTest.php b/Tests/Unit/Tools/EnumSynchronizerTest.php
@@ -13,7 +13,7 @@
 use Oro\Bundle\EntityExtendBundle\Tests\Unit\Fixtures\TestEnumValue;
 use Oro\Bundle\EntityExtendBundle\Tools\EnumSynchronizer;
 use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
-use Oro\Bundle\TranslationBundle\Entity\Translation;
+use Oro\Bundle\TranslationBundle\Translation\Translator;
 
 class EnumSynchronizerTest extends \PHPUnit_Framework_TestCase
 {
@@ -385,7 +385,7 @@ public function testApplyEnumNameTransNoTransForDefaultLocale()
     {
         $enumCode = 'test_enum';
         $enumName = 'Test Enum New';
-        $locale   = Translation::DEFAULT_LOCALE;
+        $locale   = Translator::DEFAULT_LOCALE;
 
         $this->translator->expects($this->once())
             ->method('trans')
diff --git a/Tools/EnumSynchronizer.php b/Tools/EnumSynchronizer.php
@@ -16,7 +16,7 @@
 use Oro\Bundle\EntityConfigBundle\Translation\ConfigTranslationHelper;
 use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
 use Oro\Bundle\EntityExtendBundle\Entity\Repository\EnumValueRepository;
-use Oro\Bundle\TranslationBundle\Entity\Translation;
+use Oro\Bundle\TranslationBundle\Translation\Translator;
 
 /**
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -90,7 +90,7 @@ public function sync()
                     $enumOptions        = $enumFieldConfig->get('enum_options');
 
                     if (empty($locale)) {
-                        $locale = Translation::DEFAULT_LOCALE;
+                        $locale = Translator::DEFAULT_LOCALE;
                     }
 
                     if (!empty($enumName)) {
@@ -140,7 +140,7 @@ public function applyEnumNameTrans($enumCode, $enumName, $locale)
             // labels initialization
             $labelsToBeUpdated[$labelKey]       = $enumName;
             $labelsToBeUpdated[$pluralLabelKey] = $enumName;
-            if ($locale === Translation::DEFAULT_LOCALE) {
+            if ($locale === Translator::DEFAULT_LOCALE) {
                 // set empty description only for default locale
                 $labelsToBeUpdated[$descriptionKey] = '';
             }
@@ -237,7 +237,7 @@ public function applyEnumOptions($enumValueClassName, array $options, $locale)
         }
 
         if (!empty($changes)) {
-            if ($locale !== Translation::DEFAULT_LOCALE) {
+            if ($locale !== Translator::DEFAULT_LOCALE) {
                 foreach ($changes as $value) {
                     $value->setLocale($locale);
                 }
