Skip to content

Commit 42c8845

Browse files
author
Jérôme Poskin
committed
Fix Twig extensions and Tests
1 parent 3a3a21d commit 42c8845

9 files changed

+33
-24
lines changed

‎Tests/Twig/Extension/DateExtensionTest.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ public function testGetName()
3636
public function testGetFilters()
3737
{
3838
$filters = $this->extension->getFilters();
39-
$this->assertInstanceOf('\Twig_SimpleFilter', $filters['time_ago']);
39+
$this->assertEquals(count($filters), 1);
40+
$filter = $filters[0];
41+
$this->assertInstanceOf('\Twig_SimpleFilter', $filter);
42+
$this->assertEquals($filter->getName(), 'time_ago');
4043
}
4144

4245
/**

‎Tests/Twig/Extension/TextExtensionTest.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ public function testGetName()
4343
public function testGetFilters()
4444
{
4545
$filters = $this->extension->getFilters();
46-
$this->assertInstanceOf('\Twig_SimpleFilter', $filters['safe_truncate']);
46+
$this->assertEquals(count($filters), 2);
47+
$filter = $filters[0];
48+
$this->assertInstanceOf('\Twig_SimpleFilter', $filter);
49+
$this->assertEquals($filter->getName(), 'camelize');
50+
$filter = $filters[1];
51+
$this->assertInstanceOf('\Twig_SimpleFilter', $filter);
52+
$this->assertEquals($filter->getName(), 'safe_truncate');
4753
}
4854

4955
/**

‎Twig/Extension/DateExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(TranslatorInterface $translator)
2929
public function getFilters()
3030
{
3131
return array(
32-
'time_ago' => new \Twig_SimpleFilter($this, 'timeAgo'),
32+
new \Twig_SimpleFilter('time_ago', array($this, 'timeAgo')),
3333
);
3434
}
3535

‎Twig/Extension/FacebookExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function initRuntime(\Twig_Environment $environment)
3737
public function getFunctions()
3838
{
3939
return array(
40-
'faceboook_sdk_code' => new \Twig_SimpleFunction($this, 'getFacebookSdkCode', array('is_safe' => array('html'))),
40+
new \Twig_SimpleFunction('faceboook_sdk_code', array($this, 'getFacebookSdkCode'), array('is_safe' => array('html'))),
4141
);
4242
}
4343

‎Twig/Extension/GoogleExtension.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public function initRuntime(\Twig_Environment $environment)
6666
public function getFunctions()
6767
{
6868
return array(
69-
'analytics_tracking_code' => new \Twig_SimpleFunction($this, 'getAnalyticsTrackingCode', array('is_safe' => array('html'))),
70-
'analytics_tracking_commerce' => new \Twig_SimpleFunction($this, 'getAnalyticsCommerce', array('is_safe' => array('html'))),
71-
'tags_manager_code' => new \Twig_SimpleFunction($this, 'getTagsManagerCode', array('is_safe' => array('html'))),
69+
new \Twig_SimpleFunction('analytics_tracking_code', array($this, 'getAnalyticsTrackingCode'), array('is_safe' => array('html'))),
70+
new \Twig_SimpleFunction('analytics_tracking_commerce', array($this, 'getAnalyticsCommerce'), array('is_safe' => array('html'))),
71+
new \Twig_SimpleFunction('tags_manager_code', array($this, 'getTagsManagerCode'), array('is_safe' => array('html'))),
7272
);
7373
}
7474

‎Twig/Extension/NavigationExtension.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public function __construct(NavigationRegistry $registry)
2929
public function getFunctions()
3030
{
3131
return array(
32-
'set_active_paths' => new \Twig_SimpleFunction($this, 'setActivePaths'),
33-
'add_active_path' => new \Twig_SimpleFunction($this, 'addActivePath'),
34-
'get_active_paths' => new \Twig_Function_Method($this, 'getActivePaths'),
35-
'is_active_path' => new \Twig_SimpleFunction($this, 'isActivePath'),
36-
'append_breadcrumb' => new \Twig_SimpleFunction($this, 'appendBreadcrumb'),
37-
'prepend_breadcrumb' => new \Twig_SimpleFunction($this, 'prependBreadcrumb'),
38-
'get_breadcrumbs' => new \Twig_SimpleFunction($this, 'getBreadCrumbs'),
32+
new \Twig_SimpleFunction('set_active_paths', array($this, 'setActivePaths')),
33+
new \Twig_SimpleFunction('add_active_path', array($this, 'addActivePath')),
34+
new \Twig_SimpleFunction('get_active_paths', array($this, 'getActivePaths')),
35+
new \Twig_SimpleFunction('is_active_path', array($this, 'isActivePath')),
36+
new \Twig_SimpleFunction('append_breadcrumb', array($this, 'appendBreadcrumb')),
37+
new \Twig_SimpleFunction('prepend_breadcrumb', array($this, 'prependBreadcrumb')),
38+
new \Twig_SimpleFunction('get_breadcrumbs', array($this, 'getBreadCrumbs')),
3939
);
4040
}
4141

‎Twig/Extension/PaginatorExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function initRuntime(\Twig_Environment $environment)
5252
public function getFunctions()
5353
{
5454
return array(
55-
'paginator_widget' => new \Twig_SimpleFunction($this, 'renderPaginatorWidget', array('is_safe' => array('html'))),
55+
new \Twig_SimpleFunction('paginator_widget', array($this, 'renderPaginatorWidget'), array('is_safe' => array('html'))),
5656
);
5757
}
5858

‎Twig/Extension/SiteExtension.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ class SiteExtension extends \Twig_Extension
2525
public function getFunctions()
2626
{
2727
return array(
28-
'prepend_page_title' => new \Twig_SimpleFunction($this, 'prependPageTitle'),
29-
'append_page_title' => new \Twig_SimpleFunction($this, 'appendPageTitle'),
30-
'page_title' => new \Twig_SimpleFunction($this, 'getPageTitle'),
31-
'meta_description' => new \Twig_SimpleFunction($this, 'getMetaDescription'),
32-
'set_meta_description' => new \Twig_SimpleFunction($this, 'setMetaDescription'),
33-
'meta_keywords' => new \Twig_SimpleFunction($this, 'getMetaKeywords'),
34-
'add_meta_keywords' => new \Twig_SimpleFunction($this, 'addMetaKeywords'),
28+
new \Twig_SimpleFunction('prepend_page_title', array($this, 'prependPageTitle')),
29+
new \Twig_SimpleFunction('append_page_title', array($this, 'appendPageTitle')),
30+
new \Twig_SimpleFunction('page_title', array($this, 'getPageTitle')),
31+
new \Twig_SimpleFunction('meta_description', array($this, 'getMetaDescription')),
32+
new \Twig_SimpleFunction('set_meta_description', array($this, 'setMetaDescription')),
33+
new \Twig_SimpleFunction('meta_keywords', array($this, 'getMetaKeywords')),
34+
new \Twig_SimpleFunction('add_meta_keywords', array($this, 'addMetaKeywords')),
3535
);
3636
}
3737

‎Twig/Extension/TextExtension.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ public function getName()
4444
public function getFilters()
4545
{
4646
return array(
47-
'camelize' => new \Twig_SimpleFilter($this, 'camelize', array('is_safe' => array('html'))),
48-
'safe_truncate' => new \Twig_SimpleFilter($this, 'safeTruncate', array('needs_environment' => true, 'is_safe' => array('html'))),
47+
new \Twig_SimpleFilter('camelize', array($this, 'camelize'), array('is_safe' => array('html'))),
48+
new \Twig_SimpleFilter('safe_truncate', array($this, 'safeTruncate'), array('needs_environment' => true, 'is_safe' => array('html'))),
4949
);
5050
}
5151

0 commit comments

Comments
 (0)