diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 5909f5f1c..9a12824da 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -13,7 +13,7 @@ class DefaultController extends Controller
return $this->redirectToRoute('chill_main_admin_central', [], 302);
}
- return $this->render('ChillMainBundle::layout.html.twig');
+ return $this->render('@ChillMain/layout.html.twig');
}
public function indexWithoutLocaleAction()
diff --git a/Controller/LoginController.php b/Controller/LoginController.php
index 046b78678..43eac37e5 100644
--- a/Controller/LoginController.php
+++ b/Controller/LoginController.php
@@ -29,7 +29,7 @@ class LoginController extends Controller
public function loginAction(Request $request)
{
- return $this->render('ChillMainBundle:Login:login.html.twig', array(
+ return $this->render('@ChillMain/Login/login.html.twig', array(
'last_username' => $this->helper->getLastUsername(),
'error' => $this->helper->getLastAuthenticationError()
));
diff --git a/Pagination/ChillPaginationTwig.php b/Pagination/ChillPaginationTwig.php
index daff5fe24..dcae64ce2 100644
--- a/Pagination/ChillPaginationTwig.php
+++ b/Pagination/ChillPaginationTwig.php
@@ -22,6 +22,7 @@
namespace Chill\MainBundle\Pagination;
+use Twig\Environment;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
@@ -56,7 +57,7 @@ class ChillPaginationTwig extends AbstractExtension
}
public function paginationRender(
- \Twig_Environment $env,
+ Environment $env,
PaginatorInterface $paginator,
$template = 'ChillMainBundle:Pagination:long.html.twig'
) {
diff --git a/Routing/MenuTwig.php b/Routing/MenuTwig.php
index c6a8d1aa2..2464141a0 100644
--- a/Routing/MenuTwig.php
+++ b/Routing/MenuTwig.php
@@ -24,6 +24,7 @@ namespace Chill\MainBundle\Routing;
use Chill\MainBundle\Routing\MenuComposer;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use Twig\Environment;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
@@ -86,7 +87,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
* @param string $menuId
* @param mixed[] $params
*/
- public function chillMenu(\Twig_Environment $env, $menuId, array $params = array())
+ public function chillMenu(Environment $env, $menuId, array $params = array())
{
$resolvedParams = array_merge($this->defaultParams, $params);
diff --git a/Templating/Widget/WidgetInterface.php b/Templating/Widget/WidgetInterface.php
index 82a74aabf..a768f0766 100644
--- a/Templating/Widget/WidgetInterface.php
+++ b/Templating/Widget/WidgetInterface.php
@@ -2,9 +2,9 @@
namespace Chill\MainBundle\Templating\Widget;
-use \Twig_Environment;
+use Twig\Environment;
interface WidgetInterface
{
- public function render(Twig_Environment $env, $place, array $context, array $config);
+ public function render(Environment $env, $place, array $context, array $config);
}
\ No newline at end of file
diff --git a/Templating/Widget/WidgetRenderingTwig.php b/Templating/Widget/WidgetRenderingTwig.php
index 4e2779b2d..432d5a2ac 100644
--- a/Templating/Widget/WidgetRenderingTwig.php
+++ b/Templating/Widget/WidgetRenderingTwig.php
@@ -22,6 +22,7 @@ namespace Chill\MainBundle\Templating\Widget;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Chill\MainBundle\Templating\Widget\WidgetInterface;
use Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent;
+use Twig\Environment;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
@@ -105,7 +106,7 @@ class WidgetRenderingTwig extends AbstractExtension
);
}
- public function renderingWidget(\Twig_Environment $env, $block, array $context = array())
+ public function renderingWidget(Environment $env, $block, array $context = array())
{
// get the content of widgets
$content = '';
diff --git a/templates/Admin/index.html.twig b/templates/Admin/index.html.twig
index 999034392..1e0960e61 100644
--- a/templates/Admin/index.html.twig
+++ b/templates/Admin/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
{% block admin_content %}
{{ 'Administration interface'|trans }}
diff --git a/templates/Admin/layout.html.twig b/templates/Admin/layout.html.twig
index e551b558a..c5f72cddd 100644
--- a/templates/Admin/layout.html.twig
+++ b/templates/Admin/layout.html.twig
@@ -21,12 +21,12 @@
layout.
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% block navigation_search_bar %}{% endblock %}
{% block navigation_section_menu %}
{{ chill_menu('admin_section', {
- 'layout': 'ChillMainBundle::Menu/adminSection.html.twig',
+ 'layout': '@ChillMain/Menu/adminSection.html.twig',
}) }}
{% endblock %}
diff --git a/templates/Admin/layoutWithVerticalMenu.html.twig b/templates/Admin/layoutWithVerticalMenu.html.twig
index cac73beac..ee453192a 100644
--- a/templates/Admin/layoutWithVerticalMenu.html.twig
+++ b/templates/Admin/layoutWithVerticalMenu.html.twig
@@ -21,12 +21,12 @@
layout.
#}
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% block navigation_search_bar %}{% endblock %}
{% block navigation_section_menu %}
{{ chill_menu('admin_section', {
- 'layout': 'ChillMainBundle::Menu/adminSection.html.twig',
+ 'layout': '@ChillMain/Menu/adminSection.html.twig',
}) }}
{% endblock %}
diff --git a/templates/Admin/layout_permissions.html.twig b/templates/Admin/layout_permissions.html.twig
index 32cbcaf8f..3195ffdb9 100644
--- a/templates/Admin/layout_permissions.html.twig
+++ b/templates/Admin/layout_permissions.html.twig
@@ -16,11 +16,11 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
{% block vertical_menu_content %}
{{ chill_menu('admin_permissions', {
- 'layout': 'ChillMainBundle::Menu/admin_permissions.html.twig',
+ 'layout': '@ChillMain/Menu/admin_permissions.html.twig',
}) }}
{% endblock %}
diff --git a/templates/Center/edit.html.twig b/templates/Center/edit.html.twig
index 06c2e6234..f39f5cf94 100644
--- a/templates/Center/edit.html.twig
+++ b/templates/Center/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Center edit'|trans }}{% endblock %}
diff --git a/templates/Center/index.html.twig b/templates/Center/index.html.twig
index d16a92763..5ebd271b5 100644
--- a/templates/Center/index.html.twig
+++ b/templates/Center/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Center list'|trans }}{% endblock %}
diff --git a/templates/Center/new.html.twig b/templates/Center/new.html.twig
index 05220bac9..e5205d8a3 100644
--- a/templates/Center/new.html.twig
+++ b/templates/Center/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Center creation'|trans }}{% endblock %}
diff --git a/templates/Center/show.html.twig b/templates/Center/show.html.twig
index 654a09723..b471fa2d1 100644
--- a/templates/Center/show.html.twig
+++ b/templates/Center/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Centre %name%'|trans({ '%name%': entity.name }) }}{% endblock %}
diff --git a/templates/Export/download.html.twig b/templates/Export/download.html.twig
index a12b9f3e7..ef62dfd90 100644
--- a/templates/Export/download.html.twig
+++ b/templates/Export/download.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% block title "Download export"|trans ~ export.title|trans %}
diff --git a/templates/Export/layout.html.twig b/templates/Export/layout.html.twig
index 906865702..3428c6c7f 100644
--- a/templates/Export/layout.html.twig
+++ b/templates/Export/layout.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% block title %}{{ 'Exports list'|trans }}{% endblock %}
diff --git a/templates/Export/new.html.twig b/templates/Export/new.html.twig
index a6527cac9..016b58424 100644
--- a/templates/Export/new.html.twig
+++ b/templates/Export/new.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
diff --git a/templates/Export/new_centers_step.html.twig b/templates/Export/new_centers_step.html.twig
index 2afc437f2..639b0791f 100644
--- a/templates/Export/new_centers_step.html.twig
+++ b/templates/Export/new_centers_step.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
diff --git a/templates/Export/new_formatter_step.html.twig b/templates/Export/new_formatter_step.html.twig
index 4128a59a1..72a00daeb 100644
--- a/templates/Export/new_formatter_step.html.twig
+++ b/templates/Export/new_formatter_step.html.twig
@@ -16,7 +16,7 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
{% block title %}{{ export.title|trans }}{% endblock %}
diff --git a/templates/Menu/admin.html.twig b/templates/Menu/admin.html.twig
index dbd6f7be4..8bc7f49d2 100644
--- a/templates/Menu/admin.html.twig
+++ b/templates/Menu/admin.html.twig
@@ -16,5 +16,5 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
{% block v_menu_title %}{{ 'Admin Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/templates/Menu/admin_permissions.html.twig b/templates/Menu/admin_permissions.html.twig
index c30d1d1c3..77032edca 100644
--- a/templates/Menu/admin_permissions.html.twig
+++ b/templates/Menu/admin_permissions.html.twig
@@ -16,5 +16,5 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
{% block v_menu_title %}{{ 'Permissions Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/templates/Menu/export.html.twig b/templates/Menu/export.html.twig
index 9280fccf8..336a015e6 100644
--- a/templates/Menu/export.html.twig
+++ b/templates/Menu/export.html.twig
@@ -16,5 +16,5 @@
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::Menu/verticalMenu.html.twig" %}
+{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
{% block v_menu_title %}{{ 'Export Menu'|trans }}{% endblock %}
\ No newline at end of file
diff --git a/templates/Password/password.html.twig b/templates/Password/password.html.twig
index de2a18fbd..ea77fb94c 100644
--- a/templates/Password/password.html.twig
+++ b/templates/Password/password.html.twig
@@ -17,7 +17,7 @@
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% block title %}{{"Change my password"|trans}}{% endblock %}
diff --git a/templates/PermissionsGroup/edit.html.twig b/templates/PermissionsGroup/edit.html.twig
index c8758a7d2..b58bc6a8c 100644
--- a/templates/PermissionsGroup/edit.html.twig
+++ b/templates/PermissionsGroup/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'PermissionsGroup "%name%" edit'|trans( { '%name%': entity.name } ) }}{% endblock %}
diff --git a/templates/PermissionsGroup/index.html.twig b/templates/PermissionsGroup/index.html.twig
index cc5f6c053..f416fe380 100644
--- a/templates/PermissionsGroup/index.html.twig
+++ b/templates/PermissionsGroup/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Permissions group list'|trans }}{% endblock %}
diff --git a/templates/PermissionsGroup/new.html.twig b/templates/PermissionsGroup/new.html.twig
index ed8f23e08..6d5b59b27 100644
--- a/templates/PermissionsGroup/new.html.twig
+++ b/templates/PermissionsGroup/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'New permission group'|trans }}{% endblock %}
diff --git a/templates/PermissionsGroup/show.html.twig b/templates/PermissionsGroup/show.html.twig
index e2d49a6f1..fc0b4d349 100644
--- a/templates/PermissionsGroup/show.html.twig
+++ b/templates/PermissionsGroup/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Permission group "%name%"'|trans({ '%name%': entity.name }) }}{% endblock %}
diff --git a/templates/Scope/edit.html.twig b/templates/Scope/edit.html.twig
index cd9ccb01c..1ad7ab763 100644
--- a/templates/Scope/edit.html.twig
+++ b/templates/Scope/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Circle edit'|trans }}{% endblock %}
diff --git a/templates/Scope/index.html.twig b/templates/Scope/index.html.twig
index b3087da49..5167b9d07 100644
--- a/templates/Scope/index.html.twig
+++ b/templates/Scope/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'List circles'|trans }}{% endblock %}
diff --git a/templates/Scope/new.html.twig b/templates/Scope/new.html.twig
index ef3fbe58b..14fc46274 100644
--- a/templates/Scope/new.html.twig
+++ b/templates/Scope/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Circle creation'|trans }}{% endblock %}
diff --git a/templates/Scope/show.html.twig b/templates/Scope/show.html.twig
index 694ab35a1..57c573368 100644
--- a/templates/Scope/show.html.twig
+++ b/templates/Scope/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Circle'|trans }}{% endblock %}
diff --git a/templates/Search/advanced_search.html.twig b/templates/Search/advanced_search.html.twig
index e19d47496..b13bc377a 100644
--- a/templates/Search/advanced_search.html.twig
+++ b/templates/Search/advanced_search.html.twig
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% block title title|trans %}
diff --git a/templates/Search/error.html.twig b/templates/Search/error.html.twig
index 896afa7a1..ef0679e1e 100644
--- a/templates/Search/error.html.twig
+++ b/templates/Search/error.html.twig
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% set _search_pattern = pattern %}
diff --git a/templates/Search/list.html.twig b/templates/Search/list.html.twig
index 3f725f66f..cd379a692 100644
--- a/templates/Search/list.html.twig
+++ b/templates/Search/list.html.twig
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
#}
-{% extends "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
{% set _search_pattern = pattern %}
diff --git a/templates/User/edit.html.twig b/templates/User/edit.html.twig
index 1f9a48ce1..80752d5ad 100644
--- a/templates/User/edit.html.twig
+++ b/templates/User/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'User edit'|trans }}{% endblock %}
diff --git a/templates/User/edit_password.html.twig b/templates/User/edit_password.html.twig
index 225df795a..add790c9d 100644
--- a/templates/User/edit_password.html.twig
+++ b/templates/User/edit_password.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}{% endblock %}
diff --git a/templates/User/index.html.twig b/templates/User/index.html.twig
index 255cf2ccc..c97a658bb 100644
--- a/templates/User/index.html.twig
+++ b/templates/User/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'user list'|trans|capitalize }}{% endblock %}
diff --git a/templates/User/new.html.twig b/templates/User/new.html.twig
index 2a2942722..11db501c6 100644
--- a/templates/User/new.html.twig
+++ b/templates/User/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'User creation'|trans }}{% endblock %}
diff --git a/templates/User/show.html.twig b/templates/User/show.html.twig
index 9de1d8340..ebf390dea 100644
--- a/templates/User/show.html.twig
+++ b/templates/User/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::Admin/layout_permissions.html.twig' %}
+{% extends '@ChillMain/Admin/layout_permissions.html.twig' %}
{% block title %}{{ 'User %username%'|trans({ '%username%': entity.username }) }}{% endblock %}
diff --git a/templates/layout.html.twig b/templates/layout.html.twig
index 9baba0fb5..feef5cef3 100644
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -46,12 +46,12 @@