Skip to content

Commit

Permalink
TE-1845 Migrate psr 0 to psr 4 namespaces (#839)
Browse files Browse the repository at this point in the history
* TE-1845 Updated PSR-0 to PSR-4 namespaces for Twig.
  • Loading branch information
stereomon authored Mar 22, 2019
1 parent 48033a8 commit 310eb05
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Silex\Application;
use Silex\ServiceProviderInterface;
use Spryker\Yves\Kernel\AbstractPlugin;
use Twig_Environment;
use Twig\Environment;

/**
* @method \SprykerShop\Yves\ShopPermission\ShopPermissionFactory getFactory()
Expand All @@ -25,7 +25,7 @@ class ShopPermissionServiceProvider extends AbstractPlugin implements ServicePro
public function register(Application $app)
{
$app['twig'] = $app->share(
$app->extend('twig', function (Twig_Environment $twig) use ($app) {
$app->extend('twig', function (Environment $twig) use ($app) {
$twig = $this->registerPermissionTwigFunction($twig, $app);
$twig = $this->registerPermissionTwigExtensions($twig);

Expand All @@ -35,12 +35,12 @@ public function register(Application $app)
}

/**
* @param \Twig_Environment $twig
* @param \Twig\Environment $twig
* @param \Silex\Application $app
*
* @return \Twig_Environment
* @return \Twig\Environment
*/
protected function registerPermissionTwigFunction(Twig_Environment $twig, Application $app)
protected function registerPermissionTwigFunction(Environment $twig, Application $app)
{
foreach ($this->getPermissionTwigFunctions($app) as $function) {
$twig->addFunction($function->getName(), $function);
Expand All @@ -65,11 +65,11 @@ protected function getPermissionTwigFunctions(Application $app)
}

/**
* @param \Twig_Environment $twig
* @param \Twig\Environment $twig
*
* @return \Twig_Environment
* @return \Twig\Environment
*/
protected function registerPermissionTwigExtensions(Twig_Environment $twig): Twig_Environment
protected function registerPermissionTwigExtensions(Environment $twig): Environment
{
foreach ($this->getFactory()->getPermissionTwigExtensionPlugins() as $extensionPlugin) {
$twig->addExtension($extensionPlugin);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Silex\Application;
use Spryker\Yves\Kernel\AbstractPlugin;
use Spryker\Yves\Twig\Plugin\TwigFunctionPluginInterface;
use Twig_SimpleFunction;
use Twig\TwigFunction;

/**
* @deprecated Please use PermissionTwigExtensionPlugin instead.
Expand All @@ -32,7 +32,7 @@ class PermissionTwigFunctionPlugin extends AbstractPlugin implements TwigFunctio
public function getFunctions(Application $application)
{
return [
new Twig_SimpleFunction('can', [
new TwigFunction('can', [
$this,
'can',
], [
Expand Down

0 comments on commit 310eb05

Please sign in to comment.