From e766878c07435ee29997e9d4e704fd8235c9cce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Parafi=C5=84ski?= <dawid.parafinski@ez.no>
Date: Thu, 2 Dec 2021 08:57:57 +0100
Subject: [PATCH] IBX-1543: Replaced deprecated twig functions (#29)

* IBX-1543: Replaced ez_content_name function

* IBX-1543: Added deprecation for ez_render function

* IBX-1543: Added deprecation for ez_render_*_query function

* IBX-1543: Replaced & deprecate ez_render_field function

* IBX-1543: Replaced ez_field_value function

* IBX-1543: Replaced ez_field function

* IBX-1543: Depreceted ez_field_name function

* IBX-1543: Depreceted ez_field_description function

* IBX-1543: Replaced ez_field_is_empty function

* IBX-1543: Replaced image related twig funtions

* IBX-1543: Replaced URL twig functions

* IBX-1543: Replaced rest of core extensions and filters function

* IBX-1543: Dropped removed `getName` function implementation

* IBX-1543: Replaced global `ezplatform` variable

* IBX-1543: Fixed code style

* IBX-1543: Added deprecation messeges to unit tests
---
 .../FieldDefinitionSettingsTemplates.php      |  2 +-
 .../Configuration/Parser/FieldTemplates.php   |  2 +-
 .../Resources/views/content_fields.html.twig  | 40 +++++-----
 .../default/content/asset_image.html.twig     |  4 +-
 .../views/default/content/embed.html.twig     |  6 +-
 .../default/content/embed_image.html.twig     |  4 +-
 .../default/content/embed_inline.html.twig    |  6 +-
 .../views/default/content/full.html.twig      |  4 +-
 .../views/default/content/line.html.twig      |  4 +-
 .../default/content/text_linked.html.twig     |  4 +-
 .../Core/Resources/views/pagelayout.html.twig |  4 +-
 .../View/ParameterProviderInterface.php       |  2 +-
 .../Twig/Extension/ContentExtension.php       | 68 +++++++++++++---
 .../Twig/Extension/CoreExtension.php          | 16 ++--
 .../Extension/DataAttributesExtension.php     |  9 +++
 .../Extension/FieldRenderingExtension.php     | 49 ++++++++----
 .../Twig/Extension/FileSizeExtension.php      | 23 +++---
 .../Twig/Extension/ImageExtension.php         | 23 ++++--
 .../Extension/QueryRenderingExtension.php     | 52 ++++++++----
 .../Twig/Extension/RenderContentExtension.php |  9 +++
 .../Twig/Extension/RenderExtension.php        |  9 +++
 .../Extension/RenderLocationExtension.php     |  9 +++
 .../Twig/Extension/RoutingExtension.php       | 39 +++++++--
 .../content_functions/ibexa_content_name.test | 35 ++++++++
 .../content_functions/ibexa_field.test        | 49 ++++++++++++
 .../ibexa_field_description.test              | 49 ++++++++++++
 .../content_functions/ibexa_field_name.test   | 49 ++++++++++++
 .../content_functions/ibexa_field_value.test  | 49 ++++++++++++
 .../ibexa_is_field_empty.test                 | 80 +++++++++++++++++++
 .../ibexa_render_field.test                   | 73 +++++++++++++++++
 .../ibexa_render_field_exception.test         | 23 ++++++
 ...ibexa_render_fielddefinition_settings.test | 25 ++++++
 .../filters/ez_data_attributes_serialize.test |  2 +
 .../ibexa_data_attributes_serialize.test      | 37 +++++++++
 .../functions/ez_file_size/ez_file_size.test  | 13 +++
 .../ez_file_size/ibexa_file_size.test         | 65 +++++++++++++++
 .../ibexa_render_content_query.test           | 36 +++++++++
 .../ibexa_render_content_query_esi.test       | 36 +++++++++
 .../ibexa_render_location_query.test          | 36 +++++++++
 .../ibexa_render_location_query_esi.test      | 36 +++++++++
 .../_fixtures/routing_functions/ez_path.test  | 16 ++++
 .../_fixtures/routing_functions/ez_route.test |  4 +
 .../_fixtures/routing_functions/ez_url.test   | 16 ++++
 .../routing_functions/ibexa_path.test         | 48 +++++++++++
 .../routing_functions/ibexa_route.test        | 21 +++++
 .../routing_functions/ibexa_url.test          | 48 +++++++++++
 46 files changed, 1118 insertions(+), 116 deletions(-)
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_content_name.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_description.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_name.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_value.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_is_field_empty.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field_exception.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_fielddefinition_settings.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ibexa_data_attributes_serialize.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ibexa_file_size.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_path.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_route.test
 create mode 100644 tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_url.test

diff --git a/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldDefinitionSettingsTemplates.php b/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldDefinitionSettingsTemplates.php
index 723c4ee39c..e8d5932a82 100644
--- a/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldDefinitionSettingsTemplates.php
+++ b/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldDefinitionSettingsTemplates.php
@@ -9,7 +9,7 @@
 class FieldDefinitionSettingsTemplates extends Templates
 {
     public const NODE_KEY = 'fielddefinition_settings_templates';
-    public const INFO = 'Template settings for field definition settings rendered by the ez_render_field_definition_settings() Twig function';
+    public const INFO = 'Template settings for field definition settings rendered by the ibexa_render_field_definition_settings() Twig function';
     public const INFO_TEMPLATE_KEY = 'Template file where to find block definition to display field definition settings';
 }
 
diff --git a/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldTemplates.php b/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldTemplates.php
index 23e76a9fa9..8c796d684b 100644
--- a/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldTemplates.php
+++ b/src/bundle/Core/DependencyInjection/Configuration/Parser/FieldTemplates.php
@@ -9,7 +9,7 @@
 class FieldTemplates extends Templates
 {
     public const NODE_KEY = 'field_templates';
-    public const INFO = 'Template settings for fields rendered by the ez_render_field() Twig function';
+    public const INFO = 'Template settings for fields rendered by the ibexa_render_field() Twig function';
     public const INFO_TEMPLATE_KEY = 'Template file where to find block definition to display fields';
 }
 
diff --git a/src/bundle/Core/Resources/views/content_fields.html.twig b/src/bundle/Core/Resources/views/content_fields.html.twig
index 28dac2393e..0b0041d141 100644
--- a/src/bundle/Core/Resources/views/content_fields.html.twig
+++ b/src/bundle/Core/Resources/views/content_fields.html.twig
@@ -66,7 +66,7 @@
 
 {% block ezdatetime_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% if fieldSettings.useSeconds %}
             {% set field_value = field.value.value|format_datetime( 'short', 'medium', locale=parameters.locale ) %}
         {% else %}
@@ -79,7 +79,7 @@
 
 {% block ezdate_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% set field_value = field.value.date|format_date( 'short', locale=parameters.locale ) %}
         {{ block( 'simple_block_field' ) }}
     {% endif %}
@@ -88,7 +88,7 @@
 
 {% block eztime_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% if fieldSettings.useSeconds %}
             {% set field_value = field.value.time|format_time( 'medium', locale=parameters.locale, timezone='UTC' ) %}
         {% else %}
@@ -101,7 +101,7 @@
 
 {% block ezemail_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% set field_value = field.value.email %}
         <a href="mailto:{{ field.value.email|escape( 'url' ) }}" {{ block( 'field_attributes' ) }}>{{ field.value.email }}</a>
     {% endif %}
@@ -110,7 +110,7 @@
 
 {% block ezinteger_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% set field_value = field.value.value %}
         {{ block( 'simple_inline_field' ) }}
     {% endif %}
@@ -120,7 +120,7 @@
 {# @todo: handle localization #}
 {% block ezfloat_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         {% set field_value = field.value.value %}
         {{ block( 'simple_inline_field' ) }}
     {% endif %}
@@ -129,7 +129,7 @@
 
 {% block ezurl_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         <a href="{{ field.value.link }}"
             {{ block( 'field_attributes' ) }}>{{ field.value.text ? field.value.text : field.value.link }}</a>
     {% endif %}
@@ -145,7 +145,7 @@
 
 {% block ezkeyword_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
         <ul {{ block( 'field_attributes' ) }}>
         {% for keyword in field.value.values %}
             <li>{{ keyword }}</li>
@@ -201,30 +201,30 @@
 
 {% block ezbinaryfile_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
-        {% set route_reference = ez_route( 'ez_content_download', {
+    {% if not ibexa_field_is_empty( content, field ) %}
+        {% set route_reference = ibexa_route( 'ez_content_download', {
             'content': content,
             'fieldIdentifier': field.fieldDefIdentifier,
             'inLanguage': content.prioritizedFieldLanguageCode,
             'version': versionInfo.versionNo
         } ) %}
-        <a href="{{ ez_path( route_reference ) }}"
-            {{ block( 'field_attributes' ) }}>{{ field.value.fileName }}</a>&nbsp;({{ field.value.fileSize|ez_file_size( 1 ) }})
+        <a href="{{ ibexa_path( route_reference ) }}"
+            {{ block( 'field_attributes' ) }}>{{ field.value.fileName }}</a>&nbsp;({{ field.value.fileSize|ibexa_file_size( 1 ) }})
     {% endif %}
 {% endapply %}
 {% endblock %}
 
 {% block ezmedia_field %}
-{% if not ez_field_is_empty( content, field ) %}
+{% if not ibexa_field_is_empty( content, field ) %}
 {% apply spaceless %}
     {% set type = fieldSettings.mediaType %}
     {% set value = field.value %}
-    {% set route_reference = ez_route( 'ez_content_download', {
+    {% set route_reference = ibexa_route( 'ez_content_download', {
         'content': content,
         'fieldIdentifier': field.fieldDefIdentifier,
         'version': versionInfo.versionNo
     } ) %}
-    {% set download = ez_path( route_reference ) %}
+    {% set download = ibexa_path( route_reference ) %}
     {% set width = value.width > 0 ? 'width="' ~ value.width ~ '"' : "" %}
     {% set height = value.height > 0 ? 'height="' ~ value.height ~ '"' : "" %}
     <div {{ block( 'field_attributes' ) }}>
@@ -277,7 +277,7 @@
 
 {% block ezobjectrelationlist_field %}
 {% apply spaceless %}
-    {% if not ez_field_is_empty( content, field ) %}
+    {% if not ibexa_field_is_empty( content, field ) %}
     <ul {{ block( 'field_attributes' ) }}>
         {% for contentId in field.value.destinationContentIds %}
             {% if parameters.available[contentId] %}
@@ -431,9 +431,9 @@
  #}
 {% block ezimage_field %}
 {% apply spaceless %}
-{% if not ez_field_is_empty( content, field ) %}
+{% if not ibexa_field_is_empty( content, field ) %}
 <figure {{ block( 'field_attributes' ) }}>
-    {% set imageAlias = ez_image_alias( field, versionInfo, parameters.alias|default( 'original' ) ) %}
+    {% set imageAlias = ibexa_image_alias( field, versionInfo, parameters.alias|default( 'original' ) ) %}
     {% set src = imageAlias ? asset( imageAlias.uri ) : "//:0" %}
     {% set attrs = {
         class: parameters.class|default(''),
@@ -458,7 +458,7 @@
 
 {% block ezimageasset_field %}
     {% apply spaceless %}
-        {% if not ez_field_is_empty(content, field) and parameters.available %}
+        {% if not ibexa_field_is_empty(content, field) and parameters.available %}
             <div {{ block('field_attributes') }}>
                 {{ render(controller('ez_content:embedAction', {
                     contentId: field.value.destinationContentId,
@@ -475,7 +475,7 @@
 
 {% block ezobjectrelation_field %}
 {% apply spaceless %}
-{% if not ez_field_is_empty( content, field ) and parameters.available %}
+{% if not ibexa_field_is_empty( content, field ) and parameters.available %}
     <div {{ block( 'field_attributes' ) }}>
         {{ render( controller( "ez_content:viewAction", {'contentId': field.value.destinationContentId, 'viewType': 'text_linked', 'layout': false} ) ) }}
     </div>
diff --git a/src/bundle/Core/Resources/views/default/content/asset_image.html.twig b/src/bundle/Core/Resources/views/default/content/asset_image.html.twig
index 3ff24a7ec2..f8b0e10f59 100644
--- a/src/bundle/Core/Resources/views/default/content/asset_image.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/asset_image.html.twig
@@ -1,7 +1,7 @@
-{% set image_field_identifier = ez_content_field_identifier_image_asset() %}
+{% set image_field_identifier = ibexa_content_field_identifier_image_asset() %}
 
 {% if image_field_identifier is not null %}
-    {{ ez_render_field(content, image_field_identifier, {
+    {{ ibexa_render_field(content, image_field_identifier, {
         template: '@IbexaCore/content_fields.html.twig',
         parameters: parameters
     }) }}
diff --git a/src/bundle/Core/Resources/views/default/content/embed.html.twig b/src/bundle/Core/Resources/views/default/content/embed.html.twig
index 1b8f01a97c..a5b4fb3ac9 100644
--- a/src/bundle/Core/Resources/views/default/content/embed.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/embed.html.twig
@@ -1,11 +1,11 @@
-{% set content_name=ez_content_name(content) %}
+{% set content_name=ibexa_content_name(content) %}
 
 {% if objectParameters.doNotGenerateEmbedUrl is defined and objectParameters.doNotGenerateEmbedUrl %}
     <h3>{{ content.name }}</h3>
 {% else %}
     {% if location is defined %}
-        <h3><a href="{{ ez_path(location) }}">{{ content_name }}</a></h3>
+        <h3><a href="{{ ibexa_path(location) }}">{{ content_name }}</a></h3>
     {% else %}
-        <h3><a href="{{ ez_path(content) }}">{{ content_name }}</a></h3>
+        <h3><a href="{{ ibexa_path(content) }}">{{ content_name }}</a></h3>
     {% endif %}
 {% endif %}
diff --git a/src/bundle/Core/Resources/views/default/content/embed_image.html.twig b/src/bundle/Core/Resources/views/default/content/embed_image.html.twig
index 236c07d2a3..0750710faa 100644
--- a/src/bundle/Core/Resources/views/default/content/embed_image.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/embed_image.html.twig
@@ -1,7 +1,7 @@
-{% set image_field_identifier = ez_content_field_identifier_first_filled_image(content) %}
+{% set image_field_identifier = ibexa_content_field_identifier_first_filled_image(content) %}
 
 {% if image_field_identifier is not null %}
-    {{ ez_render_field(
+    {{ ibexa_render_field(
         content,
         image_field_identifier,
         {
diff --git a/src/bundle/Core/Resources/views/default/content/embed_inline.html.twig b/src/bundle/Core/Resources/views/default/content/embed_inline.html.twig
index 1fc0c8bf74..e3491930f8 100644
--- a/src/bundle/Core/Resources/views/default/content/embed_inline.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/embed_inline.html.twig
@@ -1,6 +1,6 @@
 {%
     set data_attributes_str = (data_attributes is defined)
-        ? ' ' ~ data_attributes|ez_data_attributes_serialize
+        ? ' ' ~ data_attributes|ibexa_data_attributes_serialize
         : ''
 %}
 
@@ -8,8 +8,8 @@
     <span {% if class is defined %} class="{{ class }}"{% endif %}{{ data_attributes_str|raw }}>{{ content.name }}</span>
 {% else %}
     {% if location is defined %}
-        <a href="{{ ez_path(location) }}"{% if class is defined %} class="{{ class }}"{% endif %}{{ data_attributes_str|raw }}>{{ content.name }}</a>
+        <a href="{{ ibexa_path(location) }}"{% if class is defined %} class="{{ class }}"{% endif %}{{ data_attributes_str|raw }}>{{ content.name }}</a>
     {% else %}
-        <a href="{{ ez_path(content) }}"{% if class is defined %} class="{{ class }}"{% endif %}{{ data_attributes_str|raw }}>{{ content.name }}</a>
+        <a href="{{ ibexa_path(content) }}"{% if class is defined %} class="{{ class }}"{% endif %}{{ data_attributes_str|raw }}>{{ content.name }}</a>
     {% endif %}
 {% endif %}
diff --git a/src/bundle/Core/Resources/views/default/content/full.html.twig b/src/bundle/Core/Resources/views/default/content/full.html.twig
index 5cba95f004..4e727c230e 100644
--- a/src/bundle/Core/Resources/views/default/content/full.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/full.html.twig
@@ -1,8 +1,8 @@
 {% extends no_layout == true ? view_base_layout : page_layout %}
 {% block content %}
-    <h2>{{ ez_content_name(content) }}</h2>
+    <h2>{{ ibexa_content_name(content) }}</h2>
     {% for field in content.fieldsByLanguage(language|default(null)) %}
         <h3>{{ field.fieldDefIdentifier }}</h3>
-        {{ ez_render_field(content, field.fieldDefIdentifier, {location: location|default(null)}) }}
+        {{ ibexa_render_field(content, field.fieldDefIdentifier, {location: location|default(null)}) }}
     {% endfor %}
 {% endblock %}
diff --git a/src/bundle/Core/Resources/views/default/content/line.html.twig b/src/bundle/Core/Resources/views/default/content/line.html.twig
index b91ff3e810..164b565038 100644
--- a/src/bundle/Core/Resources/views/default/content/line.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/line.html.twig
@@ -1,7 +1,7 @@
-{% set content_name=ez_content_name(content) %}
+{% set content_name=ibexa_content_name(content) %}
 
 {% if location is defined %}
-    <p><a href="{{ ez_path(location) }}">{{ content_name }}</a></p>
+    <p><a href="{{ ibexa_path(location) }}">{{ content_name }}</a></p>
 {% else %}
     <p>{{ content_name }}</p>
 {% endif %}
diff --git a/src/bundle/Core/Resources/views/default/content/text_linked.html.twig b/src/bundle/Core/Resources/views/default/content/text_linked.html.twig
index 6205cc0432..c1ca27800a 100644
--- a/src/bundle/Core/Resources/views/default/content/text_linked.html.twig
+++ b/src/bundle/Core/Resources/views/default/content/text_linked.html.twig
@@ -1,7 +1,7 @@
-{% set content_name=ez_content_name(content) %}
+{% set content_name=ibexa_content_name(content) %}
 
 {% if location is defined %}
-    <a href="{{ ez_path(location) }}">{{ content_name }}</a>
+    <a href="{{ ibexa_path(location) }}">{{ content_name }}</a>
 {% else %}
     <p>{{ content_name }}</p>
 {% endif %}
diff --git a/src/bundle/Core/Resources/views/pagelayout.html.twig b/src/bundle/Core/Resources/views/pagelayout.html.twig
index 7a3a5fc0f1..d033946c58 100644
--- a/src/bundle/Core/Resources/views/pagelayout.html.twig
+++ b/src/bundle/Core/Resources/views/pagelayout.html.twig
@@ -3,12 +3,12 @@
 <head>
     <meta charset="utf-8">
     {% if content is defined and title is not defined %}
-        {% set title = ez_content_name( content ) %}
+        {% set title = ibexa_content_name( content ) %}
     {% endif %}
     <title>{{ title|default( 'Home' ) }}</title>
     <meta name="generator" content="Ibexa DXP"/>
     {% if content is defined and content.contentInfo.mainLocationId %}
-        <link rel="canonical" href="{{ ez_path(content) }}" />
+        <link rel="canonical" href="{{ ibexa_path(content) }}" />
     {% endif %}
 </head>
 <body>
diff --git a/src/lib/MVC/Symfony/FieldType/View/ParameterProviderInterface.php b/src/lib/MVC/Symfony/FieldType/View/ParameterProviderInterface.php
index 7d0b0a6d28..f5e5536732 100644
--- a/src/lib/MVC/Symfony/FieldType/View/ParameterProviderInterface.php
+++ b/src/lib/MVC/Symfony/FieldType/View/ParameterProviderInterface.php
@@ -9,7 +9,7 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 
 /**
- * Interface for services providing additional parameters to a fieldtype's view template (using ez_render_field() helper).
+ * Interface for services providing additional parameters to a fieldtype's view template (using ibexa_render_field() helper).
  * Each instance of this interface needs to be correctly registered in the ParameterProviderRegistry.
  *
  * @see \Ibexa\Core\MVC\Symfony\FieldType\View\ParameterProviderRegistryInterface
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php
index 7ae40db842..e2f34f2cef 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/ContentExtension.php
@@ -58,45 +58,91 @@ 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_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']
             ),
             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']
             ),
         ];
     }
 
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'ezpublish.content';
-    }
-
     /**
      * @param \Ibexa\Contracts\Core\Repository\Values\ValueObject $content Must be a valid Content or ContentInfo object.
      * @param string $forcedLanguage Locale we want the content name translation in (e.g. "fre-FR"). Null by default (takes current locale)
@@ -122,7 +168,7 @@ public function getTranslatedContentName(ValueObject $content, $forcedLanguage =
 
     /**
      * Returns the translated field, very similar to getTranslatedFieldValue but this returns the whole field.
-     * To be used with ez_image_alias for example, which requires the whole field.
+     * To be used with ibexa_image_alias for example, which requires the whole field.
      *
      * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content
      * @param string $fieldDefIdentifier Identifier for the field we want to get.
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/CoreExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/CoreExtension.php
index 4b44403630..86ecb6ad85 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/CoreExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/CoreExtension.php
@@ -20,22 +20,16 @@ public function __construct(GlobalHelper $globalHelper)
         $this->globalHelper = $globalHelper;
     }
 
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'ezpublish.core';
-    }
-
     /**
      * @return array
      */
     public function getGlobals(): array
     {
-        return ['ezplatform' => $this->globalHelper];
+        return [
+            /** @deprecated ezplatform is deprecated since 4.0, use ibexa instead */
+            'ezplatform' => $this->globalHelper,
+            'ibexa' => $this->globalHelper,
+        ];
     }
 }
 
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/DataAttributesExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/DataAttributesExtension.php
index f3192409ad..4e6b1c170c 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/DataAttributesExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/DataAttributesExtension.php
@@ -27,6 +27,15 @@ public function getFilters(): array
             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'],
                 ['is_safe' => ['html']]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php
index 6b753dc578..a63c6f8e1b 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/FieldRenderingExtension.php
@@ -48,30 +48,49 @@ public function __construct(
         $this->translationHelper = $translationHelper;
     }
 
-    public function getName()
-    {
-        return 'ezpublish.field_rendering';
-    }
-
     public function getFunctions()
     {
+        $renderFieldCallable = function (Environment $environment, Content $content, $fieldIdentifier, array $params = []) {
+            $this->fieldBlockRenderer->setTwig($environment);
+
+            return $this->renderField($content, $fieldIdentifier, $params);
+        };
+
+        $renderFieldDefinitionSettingsCallable = function (Environment $environment, FieldDefinition $fieldDefinition, array $params = []) {
+            $this->fieldBlockRenderer->setTwig($environment);
+
+            return $this->renderFieldDefinitionSettings($fieldDefinition, $params);
+        };
+
         return [
             new TwigFunction(
                 'ez_render_field',
-                function (Environment $environment, Content $content, $fieldIdentifier, array $params = []) {
-                    $this->fieldBlockRenderer->setTwig($environment);
-
-                    return $this->renderField($content, $fieldIdentifier, $params);
-                },
+                $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',
-                function (Environment $environment, FieldDefinition $fieldDefinition, array $params = []) {
-                    $this->fieldBlockRenderer->setTwig($environment);
-
-                    return $this->renderFieldDefinitionSettings($fieldDefinition, $params);
-                },
+                $renderFieldDefinitionSettingsCallable,
+                [
+                    'is_safe' => ['html'],
+                    'needs_environment' => true,
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_render_field_definition_settings',
+                ]
+            ),
+            new TwigFunction(
+                'ibexa_render_field_definition_settings',
+                $renderFieldDefinitionSettingsCallable,
                 ['is_safe' => ['html'], 'needs_environment' => true]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtension.php
index 9473611b4c..277d2ed688 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/FileSizeExtension.php
@@ -73,7 +73,18 @@ private function getLocale()
     public function getFilters()
     {
         return [
-            new TwigFilter('ez_file_size', [$this, 'sizeFilter']),
+            new TwigFilter(
+                'ez_file_size',
+                [$this, 'sizeFilter'],
+                [
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_file_size',
+                ]
+            ),
+            new TwigFilter(
+                'ibexa_file_size',
+                [$this, 'sizeFilter']
+            ),
         ];
     }
 
@@ -104,16 +115,6 @@ public function sizeFilter($number, $precision)
 
         return $formatter->format($number);
     }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'ezpublish.fileSize';
-    }
 }
 
 class_alias(FileSizeExtension::class, 'eZ\Publish\Core\MVC\Symfony\Templating\Twig\Extension\FileSizeExtension');
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/ImageExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/ImageExtension.php
index dfb355df66..0a85394329 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/ImageExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/ImageExtension.php
@@ -30,22 +30,35 @@ public function __construct(VariationHandler $imageVariationService, AssetMapper
         $this->assetMapper = $assetMapper;
     }
 
-    public function getName()
-    {
-        return 'ezpublish.image';
-    }
-
     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'],
                 ['is_safe' => ['html']]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtension.php
index a04a7c7a00..4475a52600 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/QueryRenderingExtension.php
@@ -28,28 +28,50 @@ public function __construct(FragmentHandler $fragmentHandler)
 
     public function getFunctions(): array
     {
+        $typeCallable = function (string $type, array $options): ?string {
+            $this->assertTypeIsValid($type);
+
+            return $this->fragmentHandler->render(
+                $this->createControllerReference($options)
+            );
+        };
+
+        $typeAndRendererCallable = function (string $type, string $renderer, array $options): ?string {
+            $this->assertTypeIsValid($type);
+
+            return $this->fragmentHandler->render(
+                $this->createControllerReference($options),
+                $renderer
+            );
+        };
+
         return [
             new TwigFunction(
                 'ez_render_*_query',
-                function (string $type, array $options): ?string {
-                    $this->assertTypeIsValid($type);
-
-                    return $this->fragmentHandler->render(
-                        $this->createControllerReference($options)
-                    );
-                },
+                $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_*',
-                function (string $type, string $renderer, array $options): ?string {
-                    $this->assertTypeIsValid($type);
-
-                    return $this->fragmentHandler->render(
-                        $this->createControllerReference($options),
-                        $renderer
-                    );
-                },
+                $typeAndRendererCallable,
+                [
+                    'is_safe' => ['html'],
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_render_*_query_',
+                ]
+            ),
+            new TwigFunction(
+                'ibexa_render_*_query_*',
+                $typeAndRendererCallable,
                 ['is_safe' => ['html']]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php
index 78c17e6141..b14d0eb2cb 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderContentExtension.php
@@ -38,6 +38,15 @@ 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(
                 'ez_render_content',
                 [$this, 'renderContent'],
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderExtension.php
index 640a6a5a3b..c441f8b13c 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderExtension.php
@@ -42,6 +42,15 @@ public function getFunctions(): array
             new TwigFunction(
                 'ez_render',
                 [$this, 'render'],
+                [
+                    'is_safe' => ['html'],
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_render',
+                ]
+            ),
+            new TwigFunction(
+                'ibexa_render',
+                [$this, 'render'],
                 ['is_safe' => ['html']]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderLocationExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderLocationExtension.php
index 75c4281acb..ef7f24cd4b 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderLocationExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/RenderLocationExtension.php
@@ -41,6 +41,15 @@ public function getFunctions(): array
             new TwigFunction(
                 'ez_render_location',
                 [$this, 'renderLocation'],
+                [
+                    'is_safe' => ['html'],
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_render_location',
+                ]
+            ),
+            new TwigFunction(
+                'ibexa_render_location',
+                [$this, 'renderLocation'],
                 ['is_safe' => ['html']]
             ),
         ];
diff --git a/src/lib/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php b/src/lib/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php
index 343ca141b1..165b89f2f5 100644
--- a/src/lib/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php
+++ b/src/lib/MVC/Symfony/Templating/Twig/Extension/RoutingExtension.php
@@ -43,26 +43,51 @@ 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']]
+                [
+                    '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']]
+                [
+                    'is_safe_callback' => [$this, 'isUrlGenerationSafe'],
+                    'deprecated' => '4.0',
+                    'alternative' => 'ibexa_url',
+                ]
+            ),
+            new TwigFunction(
+                'ibexa_url',
+                [$this, 'getUrl'],
+                [
+                    'is_safe_callback' => [$this, 'isUrlGenerationSafe'],
+                ]
             ),
         ];
     }
 
-    public function getName(): string
-    {
-        return 'ezpublish.routing';
-    }
-
     /**
      * @param mixed $resource
      * @param array $params
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_content_name.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_content_name.test
new file mode 100644
index 0000000000..40ebad8c52
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_content_name.test
@@ -0,0 +1,35 @@
+--TEST--
+"ibexa_content_name" function
+--TEMPLATE--
+{{ ibexa_content_name( content ) }}
+{{ ibexa_content_name( content, "eng-GB" ) }}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(),
+        array(
+            'eng-US' => 'American',
+            'fre-FR' => 'French'
+        )
+    )
+)
+--EXPECT--
+French
+French
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(),
+        array(
+            'eng-GB' => 'British',
+            'eng-US' => 'American'
+        )
+    )
+)
+--EXPECT--
+American
+British
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field.test
new file mode 100644
index 0000000000..e11d68be38
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field.test
@@ -0,0 +1,49 @@
+--TEST--
+"ibexa_field" function
+--TEMPLATE--
+{{ ibexa_field( content, "testfield" ).value }}
+{{ ibexa_field( content, "testfield", "eng-GB" ).value }}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    )
+)
+--EXPECT--
+foo2
+foo2
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                array(
+                    'id' => 5,
+                    'fieldDefIdentifier' => 'testfield',
+                    'value' => 'bar3',
+                    'languageCode' => 'eng-GB'
+                ),
+                array(
+                    'id' => 5,
+                    'fieldDefIdentifier' => 'testfield',
+                    'value' => 'foo2',
+                    'languageCode' => 'fre-FR'
+                ),
+            )
+        )
+    )
+)
+--EXPECT--
+foo2
+bar3
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_description.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_description.test
new file mode 100644
index 0000000000..67ffe1a861
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_description.test
@@ -0,0 +1,49 @@
+--TEST--
+"ibexa_field_description" function
+--TEMPLATE--
+{{ ibexa_field_description( content, 'testfield' ) }}
+{{ ibexa_field_description( content, 'testfield', "eng-GB" ) }}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR',
+                'fieldDefDescriptions' => array(
+                    'eng-US' => 'American description',
+                    'fre-FR' => 'French description',
+                )
+            )
+        )
+    )
+)
+--EXPECT--
+French description
+French description
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR',
+                'fieldDefDescriptions' => array(
+                  'eng-GB' => 'British description',
+                  'eng-US' => 'American description',
+                )
+            )
+        )
+    )
+)
+--EXPECT--
+American description
+British description
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_name.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_name.test
new file mode 100644
index 0000000000..3d2e2f4c98
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_name.test
@@ -0,0 +1,49 @@
+--TEST--
+"ibexa_field_name" function
+--TEMPLATE--
+{{ ibexa_field_name( content, 'testfield' ) }}
+{{ ibexa_field_name( content, 'testfield', "eng-GB" ) }}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR',
+                'fieldDefNames' => array(
+                    'eng-US' => 'American name',
+                    'fre-FR' => 'French name',
+                )
+            )
+        )
+    )
+)
+--EXPECT--
+French name
+French name
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR',
+                'fieldDefNames' => array(
+                  'eng-GB' => 'British name',
+                  'eng-US' => 'American name',
+                )
+            )
+        )
+    )
+)
+--EXPECT--
+American name
+British name
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_value.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_value.test
new file mode 100644
index 0000000000..0041060de7
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_field_value.test
@@ -0,0 +1,49 @@
+--TEST--
+"ibexa_field_value" function
+--TEMPLATE--
+{{ ibexa_field_value( content, "testfield" ) }}
+{{ ibexa_field_value( content, "testfield", "eng-GB" ) }}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    )
+)
+--EXPECT--
+foo2
+foo2
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'article',
+        array(
+            'ezstring' => array(
+                array(
+                    'id' => 5,
+                    'fieldDefIdentifier' => 'testfield',
+                    'value' => 'bar3',
+                    'languageCode' => 'eng-GB'
+                ),
+                array(
+                    'id' => 5,
+                    'fieldDefIdentifier' => 'testfield',
+                    'value' => 'foo2',
+                    'languageCode' => 'fre-FR'
+                ),
+            )
+        )
+    )
+)
+--EXPECT--
+foo2
+bar3
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_is_field_empty.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_is_field_empty.test
new file mode 100644
index 0000000000..2a8ee2bc65
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/content_functions/ibexa_is_field_empty.test
@@ -0,0 +1,80 @@
+--TEST--
+"ibexa_field_is_empty" function
+--TEMPLATE--
+{% if ibexa_field_is_empty( content, field ) %}
+    empty
+{% else %}
+    not empty
+{% endif %}
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'data',
+        array(
+            'ezdata' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    ),
+    'field' => $this->getField( false )->fieldDefIdentifier
+)
+--EXPECT--
+not empty
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'data',
+        array(
+            'ezdata' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    ),
+    'field' => $this->getField( true )->fieldDefIdentifier
+)
+--EXPECT--
+empty
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'data',
+        array(
+            'ezdata' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    ),
+    'field' => $this->getField( false )
+)
+--EXPECT--
+not empty
+
+--DATA--
+return array(
+    'content' => $this->getContent(
+        'data',
+        array(
+            'ezdata' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            )
+        )
+    ),
+    'field' => $this->getField( true )
+)
+--EXPECT--
+empty
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field.test
new file mode 100644
index 0000000000..24642e0b9f
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field.test
@@ -0,0 +1,73 @@
+--TEST--
+"ibexa_render_field" function
+--TEMPLATE--
+{% extends 'templates/base.html.twig' %}
+{% block content %}
+{{ ibexa_render_field( nooverride, 'testfield' ) }}
+{{ ibexa_render_field( overrides, 'testfield' ) }}
+{{ ibexa_render_field( notdefault, 'testfield' ) }}
+{{ ibexa_render_field( data, 'testfield' ) }}
+{{ ibexa_render_field( data, 'testfield', {'attr': {'class': 'added'}} ) }}
+{{ ibexa_render_field( data, 'testfield', {'parameters': { 'key1' : 1, 'key2': 2, 'key3': 3 }} ) }}
+{{ ibexa_render_field( data, 'testfield', {'parameters': [ 3, 2, 1]} ) }}
+{{ ibexa_render_field( data, 'testfield', {'parameters': [ 3, 2, 1], 'template': "templates/fields_localoverride.html.twig"} ) }}
+{{ ibexa_render_field( data, 'testfield', {'parameters': [ 3, 2, 1], 'template': _self} ) }}{% endblock %}
+{% block ezdata_field %}SELF OVERRIDE field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:3, 2, 1{% endblock %}
+--DATA--
+return array(
+    'nooverride' => $this->getContent(
+        'nooverride',
+        array(
+            'eznooverride' => array(
+                'id' => 2,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            ),
+        )
+    ),
+    'overrides' => $this->getContent(
+        'overrides',
+        array(
+            'ezoverride' => array(
+                'id' => 3,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            ),
+        )
+    ),
+    'notdefault' => $this->getContent(
+        'notdefault',
+        array(
+            'eznotdefault' => array(
+                'id' => 4,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            ),
+        )
+    ),
+    'data' => $this->getContent(
+        'data',
+        array(
+            'ezdata' => array(
+                'id' => 5,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            ),
+        )
+    )
+
+)
+--EXPECT--
+default (no override)
+override2
+not default
+field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:empty
+field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: added ezdata-field parameters:empty
+field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:1, 2, 3
+field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:3, 2, 1
+LOCAL OVERRIDE field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:3, 2, 1
+SELF OVERRIDE field id: 5 contentInfo id: 42 versionInfo versionNo: 64 attr class: ezdata-field parameters:3, 2, 1
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field_exception.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field_exception.test
new file mode 100644
index 0000000000..3d195973a2
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_field_exception.test
@@ -0,0 +1,23 @@
+--TEST--
+Exception for "ibexa_render_field" function
+--TEMPLATE--
+{% extends 'templates/base.html.twig' %}
+{% block content %}
+{{ ibexa_render_field( notexisting, 'testfield' ) }}
+{% endblock %}
+--DATA--
+return array(
+    'notexisting' => $this->getContent(
+        'notexisting',
+        array(
+            'notexisting' => array(
+                'id' => 2,
+                'fieldDefIdentifier' => 'testfield',
+                'value' => 'foo2',
+                'languageCode' => 'fre-FR'
+            ),
+        )
+    )
+)
+--EXCEPTION--
+An exception has been thrown during the rendering of a template ("Cannot find 'notexisting_field' template block.") in "index.twig" at line 4.
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_fielddefinition_settings.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_fielddefinition_settings.test
new file mode 100644
index 0000000000..caae879f94
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/field_rendering_functions/ibexa_render_fielddefinition_settings.test
@@ -0,0 +1,25 @@
+--TEST--
+"ibexa_render_field_definition_settings" function
+--TEMPLATE--
+{{ ibexa_render_field_definition_settings( nooverride ) }}
+{{ ibexa_render_field_definition_settings( overrides ) }}
+{{ ibexa_render_field_definition_settings( notdefault ) }}
+{{ ibexa_render_field_definition_settings( withdata ) }}
+{{ ibexa_render_field_definition_settings( notexisting ) }}
+--DATA--
+return array(
+    'nooverride' => $this->getFieldDefinition( 'eznooverride' ),
+    'overrides' => $this->getFieldDefinition( 'ezoverride' ),
+    'notdefault' => $this->getFieldDefinition( 'eznotdefaulttemplate' ),
+    'withdata' => $this->getFieldDefinition(
+        'ezwithdata', 42,
+        array( 'frameworks' => array( 'YUI3', 'jQuery' ) )
+    ),
+    'notexisting' => $this->getFieldDefinition( 'eznotexisting' )
+)
+--EXPECT--
+default (no override)
+override2
+not default
+42 ezwithdata YUI3, jQuery
+
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ez_data_attributes_serialize.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ez_data_attributes_serialize.test
index a3d47879ad..f6355c5a4c 100644
--- a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ez_data_attributes_serialize.test
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ez_data_attributes_serialize.test
@@ -1,5 +1,7 @@
 --TEST--
 "ez_data_attributes_serialize" filter
+--DEPRECATION--
+Twig Filter "ez_data_attributes_serialize" is deprecated since version 4.0. Use "ibexa_data_attributes_serialize" instead in index.twig at line 2.
 --TEMPLATE--
 <a href="/article" {{ data_attributes|ez_data_attributes_serialize }}>Article</a>
 --DATA--
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ibexa_data_attributes_serialize.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ibexa_data_attributes_serialize.test
new file mode 100644
index 0000000000..6681e0066d
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/filters/ibexa_data_attributes_serialize.test
@@ -0,0 +1,37 @@
+--TEST--
+"ibexa_data_attributes_serialize" filter
+--TEMPLATE--
+<a href="/article" {{ data_attributes|ibexa_data_attributes_serialize }}>Article</a>
+--DATA--
+return [
+    'data_attributes' => [
+        'my-attr1' => 'value1',
+        'my-attr2' => 'value2,value3',
+    ]
+];
+--EXPECT--
+<a href="/article" data-my-attr1="value1" data-my-attr2="value2,value3">Article</a>
+--DATA--
+return [
+    'data_attributes' => [
+        'attr' => 'foo" style="background: red',
+    ]
+];
+--EXPECT--
+<a href="/article" data-attr="foo&quot; style=&quot;background: red">Article</a>
+--DATA--
+return [
+    'data_attributes' => [
+        'attr' => true,
+    ]
+];
+--EXPECT--
+<a href="/article" data-attr="true">Article</a>
+--DATA--
+return [
+    'data_attributes' => [
+        'attr' => ['key1' => 'value1', 'key2' => 'value2'],
+    ]
+];
+--EXPECT--
+<a href="/article" data-attr="{&quot;key1&quot;:&quot;value1&quot;,&quot;key2&quot;:&quot;value2&quot;}">Article</a>
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ez_file_size.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ez_file_size.test
index 6ca6a35427..0ead905712 100644
--- a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ez_file_size.test
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ez_file_size.test
@@ -1,5 +1,18 @@
 --TEST--
 "twig" filter
+--DEPRECATION--
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 2.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 3.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 4.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 5.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 6.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 7.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 8.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 9.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 10.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 11.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 12.
+Twig Filter "ez_file_size" is deprecated since version 4.0. Use "ibexa_file_size" instead in index.twig at line 13.
 --TEMPLATE--
 {{ 10|ez_file_size( 2 ) }}
 {{ 1024|ez_file_size( 0 ) }}
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ibexa_file_size.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ibexa_file_size.test
new file mode 100644
index 0000000000..07d2372144
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/functions/ez_file_size/ibexa_file_size.test
@@ -0,0 +1,65 @@
+--TEST--
+"twig" filter
+--TEMPLATE--
+{{ 10|ibexa_file_size( 2 ) }}
+{{ 1024|ibexa_file_size( 0 ) }}
+{{ 5000|ibexa_file_size( 3 ) }}
+{{ 12000|ibexa_file_size( 1 ) }}
+{{ 151515|ibexa_file_size( 0 ) }}
+{{ 26151256|ibexa_file_size( 5 ) }}
+{{ 123123123|ibexa_file_size( 4 ) }}
+{{ 456456456456|ibexa_file_size( 1 ) }}
+{{ 789789789789789|ibexa_file_size( 6 ) }}
+{{ 789789789789789789|ibexa_file_size( 10 ) }}
+{{ 789789789789789789789|ibexa_file_size( 2 ) }}
+{{ 789789789789789789789789789|ibexa_file_size( 4 ) }}
+--DATA--
+$this->setConfigurationLocale( array( 'wrong local' ), 'eng-GB' );
+return array()
+--EXPECT--
+10 B wrong local so we take the default one which is en-GB here
+1 kB wrong local so we take the default one which is en-GB here
+5 kB wrong local so we take the default one which is en-GB here
+12 kB wrong local so we take the default one which is en-GB here
+152 kB wrong local so we take the default one which is en-GB here
+26.15126 MB wrong local so we take the default one which is en-GB here
+123.1231 MB wrong local so we take the default one which is en-GB here
+456.5 GB wrong local so we take the default one which is en-GB here
+789.78979 TB wrong local so we take the default one which is en-GB here
+789.7897897898 PB wrong local so we take the default one which is en-GB here
+789.79 EB wrong local so we take the default one which is en-GB here
+789789789.7898 EB wrong local so we take the default one which is en-GB here
+--DATA--
+return array()
+--CONFIG--
+$this->locale = "fre-FR"; return array();
+--EXPECT--
+10 B French version
+1 kB French version
+5 kB French version
+12 kB French version
+152 kB French version
+26,15126 MB French version
+123,1231 MB French version
+456,5 GB French version
+789,78979 TB French version
+789,7897897898 PB French version
+789,79 EB French version
+789789789,7898 EB French version
+--DATA--
+return array()
+--CONFIG--
+$this->locale = "eng-GB"; return array();
+--EXPECT--
+10 B English version
+1 kB English version
+5 kB English version
+12 kB English version
+152 kB English version
+26.15126 MB English version
+123.1231 MB English version
+456.5 GB English version
+789.78979 TB English version
+789.7897897898 PB English version
+789.79 EB English version
+789789789.7898 EB English version
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test
new file mode 100644
index 0000000000..39af081195
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query.test
@@ -0,0 +1,36 @@
+--TEST--
+"ibexa_render_content_query" function
+--TEMPLATE--
+{{ ibexa_render_content_query({
+    'query': {
+        'query_type': 'LatestBlogPost',
+    },
+    'template': 'latest_blog_post.html.twig',
+}) }}
+--DATA--
+return array()
+--EXPECT--
+array (
+  0 => 
+  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
+     'controller' => 'ez_query_render::renderQuery',
+     'attributes' => 
+    array (
+      'options' => 
+      array (
+        'query' => 
+        array (
+          'query_type' => 'LatestBlogPost',
+        ),
+        'template' => 'latest_blog_post.html.twig',
+      ),
+    ),
+     'query' => 
+    array (
+    ),
+  )),
+  1 => 'inline',
+  2 => 
+  array (
+  ),
+)
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test
new file mode 100644
index 0000000000..b413e92499
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_content_query_esi.test
@@ -0,0 +1,36 @@
+--TEST--
+"ibexa_render_content_query_esi" function
+--TEMPLATE--
+{{ ibexa_render_content_query_esi({
+    'query': {
+        'query_type': 'LatestBlogPost',
+    },
+    'template': 'latest_blog_post.html.twig',
+}) }}
+--DATA--
+return array()
+--EXPECT--
+array (
+  0 => 
+  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
+     'controller' => 'ez_query_render::renderQuery',
+     'attributes' => 
+    array (
+      'options' => 
+      array (
+        'query' => 
+        array (
+          'query_type' => 'LatestBlogPost',
+        ),
+        'template' => 'latest_blog_post.html.twig',
+      ),
+    ),
+     'query' => 
+    array (
+    ),
+  )),
+  1 => 'esi',
+  2 => 
+  array (
+  ),
+)
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test
new file mode 100644
index 0000000000..6b42c6fc2a
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query.test
@@ -0,0 +1,36 @@
+--TEST--
+"ibexa_render_location_query" function
+--TEMPLATE--
+{{ ibexa_render_location_query({
+    'query': {
+        'query_type': 'LatestBlogPost',
+    },
+    'template': 'latest_blog_post.html.twig',
+}) }}
+--DATA--
+return array()
+--EXPECT--
+array (
+  0 => 
+  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
+     'controller' => 'ez_query_render::renderQuery',
+     'attributes' => 
+    array (
+      'options' => 
+      array (
+        'query' => 
+        array (
+          'query_type' => 'LatestBlogPost',
+        ),
+        'template' => 'latest_blog_post.html.twig',
+      ),
+    ),
+     'query' => 
+    array (
+    ),
+  )),
+  1 => 'inline',
+  2 => 
+  array (
+  ),
+)
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test
new file mode 100644
index 0000000000..97c4de4d69
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/query_rendering_functions/ibexa_render_location_query_esi.test
@@ -0,0 +1,36 @@
+--TEST--
+"ibexa_render_location_query_esi" function
+--TEMPLATE--
+{{ ibexa_render_location_query_esi({
+    'query': {
+        'query_type': 'LatestBlogPost',
+    },
+    'template': 'latest_blog_post.html.twig',
+}) }}
+--DATA--
+return array()
+--EXPECT--
+array (
+  0 => 
+  Symfony\Component\HttpKernel\Controller\ControllerReference::__set_state(array(
+     'controller' => 'ez_query_render::renderQuery',
+     'attributes' => 
+    array (
+      'options' => 
+      array (
+        'query' => 
+        array (
+          'query_type' => 'LatestBlogPost',
+        ),
+        'template' => 'latest_blog_post.html.twig',
+      ),
+    ),
+     'query' => 
+    array (
+    ),
+  )),
+  1 => 'esi',
+  2 => 
+  array (
+  ),
+)
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_path.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_path.test
index 7d2e602a33..4fc477833f 100644
--- a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_path.test
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_path.test
@@ -1,5 +1,21 @@
 --TEST--
 "ez_path" function
+--DEPRECATION--
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 2.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 3.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 4.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 5.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 6.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 7.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 8.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 9.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 10.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 11.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 12.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 13.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 14.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 15.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 16.
 --TEMPLATE--
 {{ ez_path(location) }}
 {{ ez_path(location, {}, true) }}
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_route.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_route.test
index 703870af5f..20e6a5aba1 100644
--- a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_route.test
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_route.test
@@ -1,5 +1,9 @@
 --TEST--
 "twig" filter
+--DEPRECATION--
+Twig Function "ez_route" is deprecated since version 4.0. Use "ibexa_route" instead in index.twig at line 2.
+Twig Function "ez_route" is deprecated since version 4.0. Use "ibexa_route" instead in index.twig at line 3.
+Twig Function "ez_route" is deprecated since version 4.0. Use "ibexa_route" instead in index.twig at line 4.
 --TEMPLATE--
 {% set route_ref1 = ez_route( "foo_route" ) %}
 {% set route_ref2 = ez_route( "bar_route", {"some": "thing"} ) %}
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_url.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_url.test
index c06c9433e0..e2f5ca2ed8 100644
--- a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_url.test
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ez_url.test
@@ -1,5 +1,21 @@
 --TEST--
 "ez_url" function
+--DEPRECATION--
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 2.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 3.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 4.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 5.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 6.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 7.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 8.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 9.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 10.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 11.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 12.
+Twig Function "ez_url" is deprecated since version 4.0. Use "ibexa_url" instead in index.twig at line 13.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 14.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 15.
+Twig Function "ez_path" is deprecated since version 4.0. Use "ibexa_path" instead in index.twig at line 16.
 --TEMPLATE--
 {{ ez_url(location) }}
 {{ ez_url(location, {}, true) }}
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_path.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_path.test
new file mode 100644
index 0000000000..783f0de0be
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_path.test
@@ -0,0 +1,48 @@
+--TEST--
+"ibexa_path" function
+--TEMPLATE--
+{{ ibexa_path(location) }}
+{{ ibexa_path(location, {}, true) }}
+{{ ibexa_path(location, {'foo': 'foo'}) }}
+{{ ibexa_path(content) }}
+{{ ibexa_path(content, {}, true) }}
+{{ ibexa_path(content, {'foo': 'foo'}) }}
+{{ ibexa_path(content_info) }}
+{{ ibexa_path(content_info, {}, true) }}
+{{ ibexa_path(content_info, {'foo': 'foo'}) }}
+{{ ibexa_path(route_ref) }}
+{{ ibexa_path(route_ref, {}, true) }}
+{{ ibexa_path(route_ref, {'baz': 'baz'}) }}
+{{ ibexa_path(unsupported_object) }}
+{{ ibexa_path(unsupported_object, {}, true) }}
+{{ ibexa_path(unsupported_object, {'baz': 'baz'}) }}
+--DATA--
+return [
+    'location' => $this->getExampleLocation(54),
+    'content' => $this->getExampleContent(2),
+    'content_info' => $this->getExampleContentInfo(2),
+    'route_ref' => $this->getExampleRouteReference(
+        'example_route',
+        [
+            'foo' => 'foo',
+            'bar' => 'bar'
+        ]
+    ),
+    'unsupported_object' => $this->getExampleUnsupportedObject(),
+];
+--EXPECT--
+{"$name":"ez_urlalias","$parameters":{"locationId":54},"$referenceType":1}
+{"$name":"ez_urlalias","$parameters":{"locationId":54},"$referenceType":2}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","locationId":54},"$referenceType":1}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":1}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":2}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","contentId":2},"$referenceType":1}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":1}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":2}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","contentId":2},"$referenceType":1}
+{"$name":"example_route","$parameters":{"foo":"foo","bar":"bar"},"$referenceType":1}
+{"$name":"example_route","$parameters":{"foo":"foo","bar":"bar"},"$referenceType":2}
+{"$name":"example_route","$parameters":{"baz":"baz","foo":"foo","bar":"bar"},"$referenceType":1}
+{"$name":"","$parameters":{"_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":1}
+{"$name":"","$parameters":{"_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":2}
+{"$name":"","$parameters":{"baz":"baz","_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":1}
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_route.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_route.test
new file mode 100644
index 0000000000..f03cc5af17
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_route.test
@@ -0,0 +1,21 @@
+--TEST--
+"twig" filter
+--TEMPLATE--
+{% set route_ref1 = ibexa_route( "foo_route" ) %}
+{% set route_ref2 = ibexa_route( "bar_route", {"some": "thing"} ) %}
+{% set route_ref3 = ibexa_route( "route_66", {"direction": "highway to hell"} ) %}
+{{ route_ref1.route }}
+{{ route_ref1.get( "param", "test" ) }}
+{{ route_ref2.route }}
+{{ route_ref2.get( "some" ) }}
+{{ route_ref3.route }}
+{{ route_ref3.get( "direction", "highway to hell" ) }}
+--DATA--
+return array();
+--EXPECT--
+foo_route
+test
+bar_route
+thing
+route_66
+highway to hell
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_url.test b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_url.test
new file mode 100644
index 0000000000..2e447e180a
--- /dev/null
+++ b/tests/lib/MVC/Symfony/Templating/Twig/Extension/_fixtures/routing_functions/ibexa_url.test
@@ -0,0 +1,48 @@
+--TEST--
+"ibexa_url" function
+--TEMPLATE--
+{{ ibexa_url(location) }}
+{{ ibexa_url(location, {}, true) }}
+{{ ibexa_url(location, {'foo': 'foo'}) }}
+{{ ibexa_url(content) }}
+{{ ibexa_url(content, {}, true) }}
+{{ ibexa_url(content, {'foo': 'foo'}) }}
+{{ ibexa_url(content_info) }}
+{{ ibexa_url(content_info, {}, true) }}
+{{ ibexa_url(content_info, {'foo': 'foo'}) }}
+{{ ibexa_url(route_ref) }}
+{{ ibexa_url(route_ref, {}, true) }}
+{{ ibexa_url(route_ref, {'baz': 'baz'}) }}
+{{ ibexa_path(unsupported_object) }}
+{{ ibexa_path(unsupported_object, {}, true) }}
+{{ ibexa_path(unsupported_object, {'baz': 'baz'}) }}
+--DATA--
+return [
+    'location' => $this->getExampleLocation(54),
+    'content' => $this->getExampleContent(2),
+    'content_info' => $this->getExampleContentInfo(2),
+    'route_ref' => $this->getExampleRouteReference(
+        'example_route',
+        [
+            'foo' => 'foo',
+            'bar' => 'bar'
+        ]
+    ),
+    'unsupported_object' => $this->getExampleUnsupportedObject(),
+];
+--EXPECT--
+{"$name":"ez_urlalias","$parameters":{"locationId":54},"$referenceType":0}
+{"$name":"ez_urlalias","$parameters":{"locationId":54},"$referenceType":3}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","locationId":54},"$referenceType":0}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":0}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":3}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","contentId":2},"$referenceType":0}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":0}
+{"$name":"ez_urlalias","$parameters":{"contentId":2},"$referenceType":3}
+{"$name":"ez_urlalias","$parameters":{"foo":"foo","contentId":2},"$referenceType":0}
+{"$name":"example_route","$parameters":{"foo":"foo","bar":"bar"},"$referenceType":0}
+{"$name":"example_route","$parameters":{"foo":"foo","bar":"bar"},"$referenceType":3}
+{"$name":"example_route","$parameters":{"baz":"baz","foo":"foo","bar":"bar"},"$referenceType":0}
+{"$name":"","$parameters":{"_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":1}
+{"$name":"","$parameters":{"_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":2}
+{"$name":"","$parameters":{"baz":"baz","_route_object":{"foo":"foo","bar":"bar"}},"$referenceType":1}