EZP-30390: Removed deprecated ezprice field type

ezsystems · Apr 8, 2019 · 44c4c7b · 44c4c7b
1 parent cd02b29
commit 44c4c7b
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 139 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/translations/fieldtypes.en.xlf b/eZ/Bundle/EzPublishCoreBundle/Resources/translations/fieldtypes.en.xlf
@@ -96,11 +96,6 @@
         <target>Layout</target>
         <note>key: ezpage.name</note>
       </trans-unit>
-      <trans-unit id="3accdb01fd6ce79f38be1b4622659b61be77b608" resname="ezprice.name">
-        <source>Price</source>
-        <target>Price</target>
-        <note>key: ezprice.name</note>
-      </trans-unit>
       <trans-unit id="213da4efa5baa8b47c34dc4b645df7115d07d66e" resname="ezrichtext.name">
         <source>Rich text</source>
         <target>Rich text</target>

diff --git a/eZ/Publish/Core/FieldType/Price/SearchField.php b/eZ/Publish/Core/FieldType/Price/SearchField.php
diff --git a/...blish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezdemo_47_dump.php b/...blish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezdemo_47_dump.php
@@ -2379,20 +2379,20 @@
       'can_translate' => '1',
       'category' => '',
       'contentclass_id' => '19',
-      'data_float1' => '1',
-      'data_float2' => '0',
-      'data_float3' => '0',
+      'data_float1' => '',
+      'data_float2' => '',
+      'data_float3' => '',
       'data_float4' => '0',
-      'data_int1' => '1',
-      'data_int2' => '0',
-      'data_int3' => '0',
-      'data_int4' => '0',
+      'data_int1' => '',
+      'data_int2' => '',
+      'data_int3' => '',
+      'data_int4' => '',
       'data_text1' => '',
       'data_text2' => '',
       'data_text3' => '',
       'data_text4' => '',
       'data_text5' => '',
-      'data_type_string' => 'ezprice',
+      'data_type_string' => 'ezfloat',
       'id' => '205',
       'identifier' => 'price',
       'is_information_collector' => '0',

diff --git a/eZ/Publish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezflow_dump.php b/eZ/Publish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezflow_dump.php
@@ -3168,20 +3168,20 @@
       'can_translate' => '1',
       'category' => '',
       'contentclass_id' => '21',
-      'data_float1' => '1',
-      'data_float2' => '0',
-      'data_float3' => '0',
+      'data_float1' => '',
+      'data_float2' => '',
+      'data_float3' => '',
       'data_float4' => '0',
-      'data_int1' => '1',
-      'data_int2' => '0',
-      'data_int3' => '0',
-      'data_int4' => '0',
+      'data_int1' => '',
+      'data_int2' => '',
+      'data_int3' => '',
+      'data_int4' => '',
       'data_text1' => '',
       'data_text2' => '',
       'data_text3' => '',
       'data_text4' => '',
       'data_text5' => '',
-      'data_type_string' => 'ezprice',
+      'data_type_string' => 'ezfloat',
       'id' => '224',
       'identifier' => 'price',
       'is_information_collector' => '0',

diff --git a/eZ/Publish/Core/Search/Legacy/Tests/Content/AbstractTestCase.php b/eZ/Publish/Core/Search/Legacy/Tests/Content/AbstractTestCase.php
@@ -102,7 +102,7 @@ protected function getConverterRegistry()
                     'ezdatetime' => new Converter\DateAndTimeConverter(),
                     'ezinteger' => new Converter\IntegerConverter(),
                     'ezstring' => new Converter\TextLineConverter(),
-                    'ezprice' => new Converter\IntegerConverter(),
+                    'ezprice' => new Converter\NullConverter(),
                     'ezurl' => new Converter\UrlConverter(),
                     'ezrichtext' => new Converter\RichTextConverter(),
                     'ezboolean' => new Converter\CheckboxConverter(),

diff --git a/eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerContentTest.php b/eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerContentTest.php
@@ -897,14 +897,14 @@ public function testFieldFilterContainsSimpleNoMatch()
     public function testFieldFilterBetween()
     {
         $this->assertSearchResults(
-            array(69, 71, 72),
+            array(186, 187),
             $this->getContentSearchHandler()->findContent(
                 new Query(
                     array(
                         'filter' => new Criterion\Field(
-                            'price',
+                            'publication_date',
                             Criterion\Operator::BETWEEN,
-                            array(10000, 1000000)
+                            array(1190000000, 1200000000)
                         ),
                         'limit' => 10,
                     )
@@ -916,7 +916,7 @@ public function testFieldFilterBetween()
     public function testFieldFilterOr()
     {
         $this->assertSearchResults(
-            array(11, 69, 71, 72),
+            array(11, 186, 187),
             $this->getContentSearchHandler()->findContent(
                 new Query(
                     array(
@@ -928,9 +928,9 @@ public function testFieldFilterOr()
                                     'members'
                                 ),
                                 new Criterion\Field(
-                                    'price',
+                                    'publication_date',
                                     Criterion\Operator::BETWEEN,
-                                    array(10000, 1000000)
+                                    array(1190000000, 1200000000)
                                 ),
                             )
                         ),

diff --git a/eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerLocationTest.php b/eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerLocationTest.php
@@ -1378,14 +1378,14 @@ public function testFieldFilterContainsSimpleNoMatch()
     public function testFieldFilterBetween()
     {
         $this->assertSearchResults(
-            array(71, 73, 74),
+            array(188, 189),
             $this->getContentSearchHandler()->findLocations(
                 new LocationQuery(
                     array(
                         'filter' => new Criterion\Field(
-                            'price',
+                            'publication_date',
                             Criterion\Operator::BETWEEN,
-                            array(10000, 1000000)
+                            array(1190000000, 1200000000)
                         ),
                         'limit' => 10,
                     )
@@ -1397,7 +1397,7 @@ public function testFieldFilterBetween()
     public function testFieldFilterOr()
     {
         $this->assertSearchResults(
-            array(12, 71, 73, 74),
+            array(12, 188, 189),
             $this->getContentSearchHandler()->findLocations(
                 new LocationQuery(
                     array(
@@ -1409,9 +1409,9 @@ public function testFieldFilterOr()
                                     'members'
                                 ),
                                 new Criterion\Field(
-                                    'price',
+                                    'publication_date',
                                     Criterion\Operator::BETWEEN,
-                                    array(10000, 1000000)
+                                    array(1190000000, 1200000000)
                                 ),
                             )
                         ),

diff --git a/eZ/Publish/Core/settings/fieldtypes.yml b/eZ/Publish/Core/settings/fieldtypes.yml
@@ -494,13 +494,6 @@ services:
         tags:
             - {name: ezpublish.fieldType, alias: ezpackage}
 
-    ezpublish.fieldType.ezprice:
-        class: "%ezpublish.fieldType.eznull.class%"
-        parent: ezpublish.fieldType
-        arguments: [ "ezprice" ]
-        tags:
-            - {name: ezpublish.fieldType, alias: ezprice}
-
     ezpublish.fieldType.ezproductcategory:
         class: "%ezpublish.fieldType.eznull.class%"
         parent: ezpublish.fieldType

diff --git a/eZ/Publish/Core/settings/indexable_fieldtypes.yml b/eZ/Publish/Core/settings/indexable_fieldtypes.yml
@@ -12,7 +12,6 @@ parameters:
     ezpublish.fieldType.indexable.ezobjectrelation.class: eZ\Publish\Core\FieldType\Relation\SearchField
     ezpublish.fieldType.indexable.ezbinaryfile.class: eZ\Publish\Core\FieldType\BinaryFile\SearchField
     ezpublish.fieldType.indexable.ezdate.class: eZ\Publish\Core\FieldType\Date\SearchField
-    ezpublish.fieldType.indexable.ezprice.class: eZ\Publish\Core\FieldType\Price\SearchField
     ezpublish.fieldType.indexable.ezgmaplocation.class: eZ\Publish\Core\FieldType\MapLocation\SearchField
     ezpublish.fieldType.indexable.ezcountry.class: eZ\Publish\Core\FieldType\Country\SearchField
     ezpublish.fieldType.indexable.ezinteger.class: eZ\Publish\Core\FieldType\Integer\SearchField
@@ -39,11 +38,6 @@ services:
         tags:
             - {name: ezpublish.fieldType.indexable, alias: ezstring}
 
-    ezpublish.fieldType.indexable.ezprice:
-        class: "%ezpublish.fieldType.indexable.ezprice.class%"
-        tags:
-            - {name: ezpublish.fieldType.indexable, alias: ezprice}
-
     ezpublish.fieldType.indexable.ezgmaplocation:
         class: "%ezpublish.fieldType.indexable.ezgmaplocation.class%"
         tags:
@@ -155,7 +149,6 @@ services:
             - {name: ezpublish.fieldType.indexable, alias: ezmultiprice}
             - {name: ezpublish.fieldType.indexable, alias: ezoption}
             - {name: ezpublish.fieldType.indexable, alias: ezpackage}
-            - {name: ezpublish.fieldType.indexable, alias: ezprice}
             - {name: ezpublish.fieldType.indexable, alias: ezproductcategory}
             - {name: ezpublish.fieldType.indexable, alias: ezrangeoption}
             - {name: ezpublish.fieldType.indexable, alias: ezsrrating}

diff --git a/eZ/Publish/Core/settings/storage_engines/legacy/field_value_converters.yml b/eZ/Publish/Core/settings/storage_engines/legacy/field_value_converters.yml
@@ -202,11 +202,6 @@ services:
         tags:
             - {name: ezpublish.storageEngine.legacy.converter, alias: ezpackage}
 
-    ezpublish.fieldType.ezprice.converter:
-        class: "%ezpublish.fieldType.eznull.converter.class%"
-        tags:
-            - {name: ezpublish.storageEngine.legacy.converter, alias: ezprice}
-
     ezpublish.fieldType.ezproductcategory.converter:
         class: "%ezpublish.fieldType.eznull.converter.class%"
         tags: