From 7fc63075cf80bd850e0d2e9b308bdb6163a31ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 7 Oct 2015 16:29:15 +0200 Subject: [PATCH 1/6] Deprecating a bunch of useless functions. See #15 --- src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index cb0b264..f1f363d 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -63,17 +63,17 @@ public function getFunctions() /** * The l function will create a relative URL : in fact, it simply preprends the ROOT_URL */ - new \Twig_SimpleFunction('l', [$this, 'createRelativeLink']), + new \Twig_SimpleFunction('l', [$this, 'createRelativeLink'], array('deprecated' => true)), /** * The tourl function will create a link instead of a string */ - new \Twig_SimpleFunction('tourl', [$this, 'toUrl']), + new \Twig_SimpleFunction('tourl', [$this, 'toUrl'], array('deprecated' => true)), /** * The Cookies function will return the $_COOKIE list */ - new \Twig_SimpleFunction('cookies', [$this, 'getCookie']), + new \Twig_SimpleFunction('cookies', [$this, 'getCookie'], array('deprecated' => true)), ); } From 2107e99bc3450ed5a121e44c74bfb19e5012349f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 7 Oct 2015 16:49:19 +0200 Subject: [PATCH 2/6] Adding translation filter. Closes #2, See #15 --- .../Html/Renderer/Twig/MoufTwigExtension.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index f1f363d..b7b7eae 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -77,6 +77,18 @@ public function getFunctions() ); } + /** + * Returns a list of filters to add to the existing list. + * + * @return array An array of filters + */ + public function getFilters() + { + return array( + new \Twig_SimpleFilter('t', [$this, 'translateFilter'], array('is_variadic' => true)), + ); + } + public function toHtml($param) { if ($param == null) { @@ -116,6 +128,12 @@ public function translate(array $args = array()) return call_user_func_array('iMsgNoEdit', $args); } + public function translateFilter($text, array $args = array()) + { + array_unshift($args, $text); + return call_user_func_array('iMsgNoEdit', $args); + } + public function createRelativeLink($param) { return ROOT_URL.$param; From 68a4fbb2b0e332f6a6b78a32eacd7dba22405e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 7 Oct 2015 16:49:19 +0200 Subject: [PATCH 3/6] Adding translation filter. Closes #2, See #15 --- .../Html/Renderer/Twig/MoufTwigExtension.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index f1f363d..b7b7eae 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -77,6 +77,18 @@ public function getFunctions() ); } + /** + * Returns a list of filters to add to the existing list. + * + * @return array An array of filters + */ + public function getFilters() + { + return array( + new \Twig_SimpleFilter('t', [$this, 'translateFilter'], array('is_variadic' => true)), + ); + } + public function toHtml($param) { if ($param == null) { @@ -116,6 +128,12 @@ public function translate(array $args = array()) return call_user_func_array('iMsgNoEdit', $args); } + public function translateFilter($text, array $args = array()) + { + array_unshift($args, $text); + return call_user_func_array('iMsgNoEdit', $args); + } + public function createRelativeLink($param) { return ROOT_URL.$param; From bc7438d7c032c2ab490dd1b071fa3d0228d8e299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 7 Oct 2015 17:09:51 +0200 Subject: [PATCH 4/6] Simplifying code --- src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index b7b7eae..ba74e64 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -58,7 +58,7 @@ public function getFunctions() /** * The t function will call the iMsgNoEdit() method of the string passed in parameter */ - new \Twig_SimpleFunction('t', [$this, 'translate'], array('is_variadic' => true)), + new \Twig_SimpleFunction('t', [$this, 'translate'], array('is_variadic' => true, 'deprecated' => true, 'alternative' => '"t" filter'), /** * The l function will create a relative URL : in fact, it simply preprends the ROOT_URL @@ -123,12 +123,7 @@ public function getValue($param) return $this->container->get($param)->val(); } - public function translate(array $args = array()) - { - return call_user_func_array('iMsgNoEdit', $args); - } - - public function translateFilter($text, array $args = array()) + public function translate($text, array $args = array()) { array_unshift($args, $text); return call_user_func_array('iMsgNoEdit', $args); From 7951733bed873500ed1ba18db206a462c8283c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 7 Oct 2015 17:09:51 +0200 Subject: [PATCH 5/6] Simplifying code --- src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index cd776a3..3e65ea4 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -85,7 +85,7 @@ public function getFunctions() public function getFilters() { return array( - new \Twig_SimpleFilter('t', [$this, 'translateFilter'], array('is_variadic' => true)), + new \Twig_SimpleFilter('t', [$this, 'translate'], array('is_variadic' => true)), ); } @@ -129,12 +129,6 @@ public function translate($text, array $args = array()) return call_user_func_array('iMsgNoEdit', $args); } - public function translateFilter($text, array $args = array()) - { - array_unshift($args, $text); - return call_user_func_array('iMsgNoEdit', $args); - } - public function createRelativeLink($param) { return ROOT_URL.$param; From cf733f641d50456666fe95a754cfe7e3140cd0c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Thu, 8 Oct 2015 18:41:33 +0200 Subject: [PATCH 6/6] Fixing merge conflict issue --- src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php index 3e65ea4..c0b4e7f 100644 --- a/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php +++ b/src/Mouf/Html/Renderer/Twig/MoufTwigExtension.php @@ -58,7 +58,7 @@ public function getFunctions() /** * The t function will call the iMsgNoEdit() method of the string passed in parameter */ - new \Twig_SimpleFunction('t', [$this, 'translate'], array('is_variadic' => true, 'deprecated' => true, 'alternative' => '"t" filter'), + new \Twig_SimpleFunction('t', [$this, 'translate'], array('is_variadic' => true, 'deprecated' => true, 'alternative' => '"t" filter')), /** * The l function will create a relative URL : in fact, it simply preprends the ROOT_URL