BB-12248: Move FieldHelper to EntityBundle

Valentyna Shabala · popadko · commit bf444ce2f430 · 2016-10-28T15:41:53.000+03:00
- moving class, service
 - refactoring usages
 - fixing tests
diff --git a/ImportExport/Serializer/EnumNormalizer.php b/ImportExport/Serializer/EnumNormalizer.php
@@ -4,10 +4,10 @@
 
 use Doctrine\Common\Util\ClassUtils;
 
+use Oro\Bundle\EntityBundle\Helper\FieldHelper;
 use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
 use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\DenormalizerInterface;
 use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\NormalizerInterface;
-use Oro\Bundle\ImportExportBundle\Field\FieldHelper;
 
 class EnumNormalizer implements NormalizerInterface, DenormalizerInterface
 {
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -370,7 +370,7 @@ services:
     oro_entity_extend.importexport.normalizer.enum:
         class: %oro_entity_extend.importexport.normalizer.enum.class%
         arguments:
-            - "@oro_importexport.field.field_helper"
+            - "@oro_entity.helper.field_helper"
         tags:
             - { name: oro_importexport.normalizer, priority: 20 }
 
diff --git a/Tests/Unit/ImportExport/Serializer/EnumNormalizerTest.php b/Tests/Unit/ImportExport/Serializer/EnumNormalizerTest.php
@@ -2,10 +2,10 @@
 
 namespace Oro\Bundle\EntityExtendBundle\Tests\Unit\ImportExport\Serializer;
 
+use Oro\Bundle\EntityBundle\Helper\FieldHelper;
 use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
 use Oro\Bundle\EntityExtendBundle\ImportExport\Serializer\EnumNormalizer;
 use Oro\Bundle\EntityExtendBundle\Tests\Unit\Fixtures\TestEnumValue;
-use Oro\Bundle\ImportExportBundle\Field\FieldHelper;
 
 class EnumNormalizerTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ class EnumNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fieldHelper = $this->getMockBuilder('Oro\Bundle\ImportExportBundle\Field\FieldHelper')
+        $this->fieldHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\Helper\FieldHelper')
             ->disableOriginalConstructor()
             ->getMock();
 

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`
`5`	`5`	`use Doctrine\Common\Util\ClassUtils;`
`6`	`6`
	`7`	`+use Oro\Bundle\EntityBundle\Helper\FieldHelper;`
`7`	`8`	`use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;`
`8`	`9`	`use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\DenormalizerInterface;`
`9`	`10`	`use Oro\Bundle\ImportExportBundle\Serializer\Normalizer\NormalizerInterface;`
`10`		`-use Oro\Bundle\ImportExportBundle\Field\FieldHelper;`
`11`	`11`
`12`	`12`	`class EnumNormalizer implements NormalizerInterface, DenormalizerInterface`
`13`	`13`	`{`