Skip to content

Commit

Permalink
IBX-8805: Dropped deprecated Twig Functions&Filters (#450)
Browse files Browse the repository at this point in the history 
* IBX-8805: Dropped deprecated Twig Functions&Filters

* dropped old fixtures
  • Loading branch information
@ViniTou
ViniTou authored Nov 7, 2024
1 parent 0c5f86c commit 78236ff
Show file tree
Hide file tree
Showing 31 changed files with 2 additions and 992 deletions.
2 changes: 1 addition & 1 deletion src/bundle/Core/Resources/views/content_fields.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# - \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo contentInfo the contentInfo to which the field belongs to
# - \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo versionInfo the versionInfo to which the field belongs to
# - mixed fieldSettings settings of the field (depends on the fieldtype)
# - array parameters options passed to ez_render_field under the parameters key
# - array parameters options passed to ibexa_render_field under the parameters key
# - array attr the attributes to add the generate HTML, contains at least a "class" entry
# containing <fieldtypeidentifier>-field
#}
Expand Down
56 changes: 0 additions & 56 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,50 +62,18 @@ public function __construct(
public function getFunctions()
{
return [
new TwigFunction(
'ez_content_name',
[$this, 'getTranslatedContentName'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_content_name',
]
),
new TwigFunction(
'ibexa_content_name',
[$this, 'getTranslatedContentName']
),
new TwigFunction(
'ez_field_value',
[$this, 'getTranslatedFieldValue'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_field_value',
]
),
new TwigFunction(
'ibexa_field_value',
[$this, 'getTranslatedFieldValue']
),
new TwigFunction(
'ez_field',
[$this, 'getTranslatedField'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_field',
]
),
new TwigFunction(
'ibexa_field',
[$this, 'getTranslatedField']
),
new TwigFunction(
'ez_field_is_empty',
[$this, 'isFieldEmpty'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_field_is_empty',
]
),
new TwigFunction(
'ibexa_has_field',
[$this, 'hasField']
Expand All @@ -114,26 +82,10 @@ public function getFunctions()
'ibexa_field_is_empty',
[$this, 'isFieldEmpty']
),
new TwigFunction(
'ez_field_name',
[$this, 'getTranslatedFieldDefinitionName'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_field_name',
]
),
new TwigFunction(
'ibexa_field_name',
[$this, 'getTranslatedFieldDefinitionName']
),
new TwigFunction(
'ez_field_description',
[$this, 'getTranslatedFieldDefinitionDescription'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_field_description',
]
),
new TwigFunction(
'ibexa_field_description',
[$this, 'getTranslatedFieldDefinitionDescription']
Expand All @@ -142,14 +94,6 @@ public function getFunctions()
'ibexa_field_group_name',
[$this, 'getFieldGroupName']
),
new TwigFunction(
'ez_content_field_identifier_first_filled_image',
[$this, 'getFirstFilledImageFieldIdentifier'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_content_field_identifier_first_filled_image',
]
),
new TwigFunction(
'ibexa_content_field_identifier_first_filled_image',
[$this, 'getFirstFilledImageFieldIdentifier']
Expand Down
9 changes: 0 additions & 9 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/DataAttributesExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@ class DataAttributesExtension extends AbstractExtension
public function getFilters(): array
{
return [
new TwigFilter(
'ez_data_attributes_serialize',
[$this, 'serializeDataAttributes'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_data_attributes_serialize',
]
),
new TwigFilter(
'ibexa_data_attributes_serialize',
[$this, 'serializeDataAttributes'],
Expand Down
20 changes: 0 additions & 20 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,11 @@ public function getFunctions()
};

return [
new TwigFunction(
'ez_render_field',
$renderFieldCallable,
[
'is_safe' => ['html'],
'needs_environment' => true,
'deprecated' => '4.0',
'alternative' => 'ibexa_render_field',
]
),
new TwigFunction(
'ibexa_render_field',
$renderFieldCallable,
['is_safe' => ['html'], 'needs_environment' => true]
),
new TwigFunction(
'ez_render_field_definition_settings',
$renderFieldDefinitionSettingsCallable,
[
'is_safe' => ['html'],
'needs_environment' => true,
'deprecated' => '4.0',
'alternative' => 'ibexa_render_field_definition_settings',
]
),
new TwigFunction(
'ibexa_render_field_definition_settings',
$renderFieldDefinitionSettingsCallable,
Expand Down
8 changes: 0 additions & 8 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,6 @@ private function getLocale()
public function getFilters()
{
return [
new TwigFilter(
'ez_file_size',
[$this, 'sizeFilter'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_file_size',
]
),
new TwigFilter(
'ibexa_file_size',
[$this, 'sizeFilter']
Expand Down
18 changes: 0 additions & 18 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/ImageExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,11 @@ public function __construct(VariationHandler $imageVariationService, AssetMapper
public function getFunctions()
{
return [
new TwigFunction(
'ez_image_alias',
[$this, 'getImageVariation'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_image_alias',
]
),
new TwigFunction(
'ibexa_image_alias',
[$this, 'getImageVariation'],
['is_safe' => ['html']]
),
new TwigFunction(
'ez_content_field_identifier_image_asset',
[$this, 'getImageAssetContentFieldIdentifier'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_content_field_identifier_image_asset',
]
),
new TwigFunction(
'ibexa_content_field_identifier_image_asset',
[$this, 'getImageAssetContentFieldIdentifier'],
Expand Down
18 changes: 0 additions & 18 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,11 @@ public function getFunctions(): array
};

return [
new TwigFunction(
'ez_render_*_query',
$typeCallable,
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_render_*_query',
]
),
new TwigFunction(
'ibexa_render_*_query',
$typeCallable,
['is_safe' => ['html']]
),
new TwigFunction(
'ez_render_*_query_*',
$typeAndRendererCallable,
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_render_*_query_',
]
),
new TwigFunction(
'ibexa_render_*_query_*',
$typeAndRendererCallable,
Expand Down
9 changes: 0 additions & 9 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ public function __construct(
public function getFunctions(): array
{
return [
new TwigFunction(
'ez_render_content',
[$this, 'renderContent'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_render_content',
]
),
new TwigFunction(
'ibexa_render_content',
[$this, 'renderContent'],
Expand Down
9 changes: 0 additions & 9 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/RenderExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,6 @@ public function __construct(
public function getFunctions(): array
{
return [
new TwigFunction(
'ez_render',
[$this, 'render'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_render',
]
),
new TwigFunction(
'ibexa_render',
[$this, 'render'],
Expand Down
9 changes: 0 additions & 9 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/RenderLocationExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ public function __construct(
public function getFunctions(): array
{
return [
new TwigFunction(
'ez_render_location',
[$this, 'renderLocation'],
[
'is_safe' => ['html'],
'deprecated' => '4.0',
'alternative' => 'ibexa_render_location',
]
),
new TwigFunction(
'ibexa_render_location',
[$this, 'renderLocation'],
Expand Down
26 changes: 0 additions & 26 deletions src/lib/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,43 +43,17 @@ public function __construct(
public function getFunctions(): array
{
return [
new TwigFunction(
'ez_route',
[$this, 'getRouteReference'],
[
'deprecated' => '4.0',
'alternative' => 'ibexa_route',
]
),
new TwigFunction(
'ibexa_route',
[$this, 'getRouteReference']
),
new TwigFunction(
'ez_path',
[$this, 'getPath'],
[
'is_safe_callback' => [$this, 'isUrlGenerationSafe'],
'deprecated' => '4.0',
'alternative' => 'ibexa_path',
]
),
new TwigFunction(
'ibexa_path',
[$this, 'getPath'],
[
'is_safe_callback' => [$this, 'isUrlGenerationSafe'],
]
),
new TwigFunction(
'ez_url',
[$this, 'getUrl'],
[
'is_safe_callback' => [$this, 'isUrlGenerationSafe'],
'deprecated' => '4.0',
'alternative' => 'ibexa_url',
]
),
new TwigFunction(
'ibexa_url',
[$this, 'getUrl'],
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtensionTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected function getExtensions()
*/
protected function getFixturesDir()
{
return __DIR__ . '/_fixtures/functions/ez_file_size';
return __DIR__ . '/_fixtures/functions/ibexa_file_size';
}

/**
Expand Down
35 changes: 0 additions & 35 deletions ...ib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ez_content_name.test
View file

This file was deleted.

Loading

0 comments on commit 78236ff

Please sign in to comment.