Skip to content

Commit ae0d6ff

Browse files
committed
Merge pull request #854 from XWB/twig
Removed deprecated Twig features
2 parents 2b934a2 + 65b4f9e commit ae0d6ff

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Twig/Extension/OAuthExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ public function __construct(OAuthHelper $helper)
3939
public function getFunctions()
4040
{
4141
return array(
42-
'hwi_oauth_authorization_url' => new \Twig_Function_Method($this, 'getAuthorizationUrl'),
43-
'hwi_oauth_login_url' => new \Twig_Function_Method($this, 'getLoginUrl'),
44-
'hwi_oauth_resource_owners' => new \Twig_Function_Method($this, 'getResourceOwners')
42+
new \Twig_SimpleFunction('hwi_oauth_authorization_url', array($this, 'getAuthorizationUrl')),
43+
new \Twig_SimpleFunction('hwi_oauth_login_url', array($this, 'getLoginUrl')),
44+
new \Twig_SimpleFunction('hwi_oauth_resource_owners', array($this, 'getResourceOwners')),
4545
);
4646
}
4747

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@
7575
"kriswallsmith/buzz": "~0.7"
7676
},
7777

78+
"conflict": {
79+
"twig/twig": "<1.12"
80+
},
81+
7882
"require-dev": {
7983
"doctrine/orm": "~2.2",
8084
"symfony/property-access": "~2.3",

0 commit comments

Comments
 (0)