Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-30390: Removed deprecated ezprice field type #2600

Merged
merged 2 commits into from
May 8, 2019
Merged

EZP-30390: Removed deprecated ezprice field type #2600

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0233e3
EZP-30390: Removed deprecated ezprice field type
adamwojs Apr 8, 2019
20b86cd
Fixed typo in doc/bc/changes-8.0.md
alongosz May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/demo_data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,7 +2863,7 @@
'data_text3' => '',
'data_text4' => '',
'data_text5' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '216',
'identifier' => 'price',
'is_information_collector' => '0',
Expand Down
3 changes: 3 additions & 0 deletions doc/bc/changes-8.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ Changes affecting version compatibility with former or future versions.
while the latest Elasticsearch release is 7.0.

The support for this search engine will be provided once again as a separate bundle.

* The following field type are not supported any more and have been removed:
* ezprice
5 changes: 0 additions & 5 deletions eZ/Bundle/EzPublishCoreBundle/Resources/translations/fieldtypes.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
86 changes: 0 additions & 86 deletions eZ/Publish/Core/FieldType/Price/SearchField.php
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...blish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezdemo_47_dump.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,11 +2379,11 @@
'can_translate' => '1',
'category' => '',
'contentclass_id' => '19',
'data_float1' => '1',
'data_float1' => '0',
'data_float2' => '0',
'data_float3' => '0',
'data_float4' => '0',
'data_int1' => '1',
'data_int1' => '0',
'data_int2' => '0',
'data_int3' => '0',
'data_int4' => '0',
Expand All @@ -2392,7 +2392,7 @@
'data_text3' => '',
'data_text4' => '',
'data_text5' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '205',
'identifier' => 'price',
'is_information_collector' => '0',
Expand Down
6 changes: 3 additions & 3 deletions eZ/Publish/Core/Repository/Tests/Service/Integration/Legacy/_fixtures/clean_ezflow_dump.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3168,11 +3168,11 @@
'can_translate' => '1',
'category' => '',
'contentclass_id' => '21',
'data_float1' => '1',
'data_float1' => '0',
'data_float2' => '0',
'data_float3' => '0',
'data_float4' => '0',
'data_int1' => '1',
'data_int1' => '0',
'data_int2' => '0',
'data_int3' => '0',
'data_int4' => '0',
Expand All @@ -3181,7 +3181,7 @@
'data_text3' => '',
'data_text4' => '',
'data_text5' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '224',
'identifier' => 'price',
'is_information_collector' => '0',
Expand Down
2 changes: 1 addition & 1 deletion eZ/Publish/Core/Search/Legacy/Tests/Content/AbstractTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ protected function getConverterRegistry()
'ezdatetime' => new Converter\DateAndTimeConverter(),
'ezinteger' => new Converter\IntegerConverter(),
'ezstring' => new Converter\TextLineConverter(),
'ezprice' => new Converter\IntegerConverter(),
'ezfloat' => new Converter\FloatConverter(),
'ezurl' => new Converter\UrlConverter(),
'ezrichtext' => new Converter\RichTextConverter(),
'ezboolean' => new Converter\CheckboxConverter(),
Expand Down
12 changes: 6 additions & 6 deletions eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerContentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -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(
Expand All @@ -928,9 +928,9 @@ public function testFieldFilterOr()
'members'
),
new Criterion\Field(
'price',
'publication_date',
Criterion\Operator::BETWEEN,
array(10000, 1000000)
array(1190000000, 1200000000)
),
)
),
Expand Down
12 changes: 6 additions & 6 deletions eZ/Publish/Core/Search/Legacy/Tests/Content/HandlerLocationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand All @@ -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(
Expand All @@ -1409,9 +1409,9 @@ public function testFieldFilterOr()
'members'
),
new Criterion\Field(
'price',
'publication_date',
Criterion\Operator::BETWEEN,
array(10000, 1000000)
array(1190000000, 1200000000)
),
)
),
Expand Down
10 changes: 5 additions & 5 deletions eZ/Publish/Core/Search/Legacy/Tests/_fixtures/full_dump.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3086,7 +3086,7 @@
'data_text3' => '',
'data_text4' => '',
'data_text5' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '224',
'identifier' => 'price',
'is_information_collector' => '0',
Expand Down Expand Up @@ -12578,7 +12578,7 @@
'data_float' => '499',
'data_int' => NULL,
'data_text' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '271',
'language_code' => 'eng-US',
'language_id' => '2',
Expand Down Expand Up @@ -12848,7 +12848,7 @@
'data_float' => '199',
'data_int' => NULL,
'data_text' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '287',
'language_code' => 'eng-US',
'language_id' => '2',
Expand Down Expand Up @@ -13002,7 +13002,7 @@
'data_float' => '299',
'data_int' => NULL,
'data_text' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '296',
'language_code' => 'eng-US',
'language_id' => '2',
Expand Down Expand Up @@ -13156,7 +13156,7 @@
'data_float' => '99',
'data_int' => NULL,
'data_text' => '',
'data_type_string' => 'ezprice',
'data_type_string' => 'ezfloat',
'id' => '305',
'language_code' => 'eng-US',
'language_id' => '2',
Expand Down
7 changes: 0 additions & 7 deletions eZ/Publish/Core/settings/fieldtypes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions eZ/Publish/Core/settings/indexable_fieldtypes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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}
Expand Down
5 changes: 0 additions & 5 deletions eZ/Publish/Core/settings/storage_engines/legacy/field_value_converters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down