From 036d06775787bd7d7ee515b4b42b413aed7b12f5 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Fri, 31 Jul 2020 14:53:30 +0200 Subject: [PATCH] Revise obsolete use of \Twig_Filter to Twig\TwigFilter --- src/Twig/Extensions/ArrayValuesTwigExtension.php | 3 ++- src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php | 3 ++- src/Twig/Extensions/InflectionExtension.php | 5 +++-- src/Twig/Extensions/TransformExtension.php | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Twig/Extensions/ArrayValuesTwigExtension.php b/src/Twig/Extensions/ArrayValuesTwigExtension.php index f12398f..231886c 100644 --- a/src/Twig/Extensions/ArrayValuesTwigExtension.php +++ b/src/Twig/Extensions/ArrayValuesTwigExtension.php @@ -3,6 +3,7 @@ namespace Benzine\Twig\Extensions; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; class ArrayValuesTwigExtension extends AbstractExtension { @@ -16,7 +17,7 @@ class ArrayValuesTwigExtension extends AbstractExtension $filters = []; $methods = ['values']; foreach ($methods as $method) { - $filters[$method] = new \Twig_Filter($method, [$this, $method]); + $filters[$method] = new TwigFilter($method, [$this, $method]); } return $filters; diff --git a/src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php b/src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php index 48d24bd..ed021e6 100644 --- a/src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php +++ b/src/Twig/Extensions/FilterAlphanumericOnlyTwigExtension.php @@ -3,6 +3,7 @@ namespace Benzine\Twig\Extensions; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; class FilterAlphanumericOnlyTwigExtension extends AbstractExtension { @@ -16,7 +17,7 @@ class FilterAlphanumericOnlyTwigExtension extends AbstractExtension $filters = []; $methods = ['filteralphaonly']; foreach ($methods as $method) { - $filters[$method] = new \Twig_Filter($method, [$this, $method]); + $filters[$method] = new TwigFilter($method, [$this, $method]); } return $filters; diff --git a/src/Twig/Extensions/InflectionExtension.php b/src/Twig/Extensions/InflectionExtension.php index f5c608d..224c4fd 100644 --- a/src/Twig/Extensions/InflectionExtension.php +++ b/src/Twig/Extensions/InflectionExtension.php @@ -4,16 +4,17 @@ namespace Benzine\Twig\Extensions; use Gone\Inflection\Inflect; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; class InflectionExtension extends AbstractExtension { public function getFilters() { $filters = []; - $filters['pluralize'] = new \Twig_SimpleFilter('pluralize', function ($word) { + $filters['pluralize'] = new TwigFilter('pluralize', function ($word) { return Inflect::pluralize($word); }); - $filters['singularize'] = new \Twig_SimpleFilter('singularize', function ($word) { + $filters['singularize'] = new TwigFilter('singularize', function ($word) { return Inflect::singularize($word); }); diff --git a/src/Twig/Extensions/TransformExtension.php b/src/Twig/Extensions/TransformExtension.php index f7db9d9..c3b46fb 100644 --- a/src/Twig/Extensions/TransformExtension.php +++ b/src/Twig/Extensions/TransformExtension.php @@ -5,6 +5,7 @@ namespace Benzine\Twig\Extensions; use Camel\CaseTransformer; use Camel\Format; use Twig\Extension\AbstractExtension; +use Twig\TwigFilter; class TransformExtension extends AbstractExtension { @@ -24,7 +25,7 @@ class TransformExtension extends AbstractExtension $name = 'transform_'.strtolower($fromTransformer).'_to_'.strtolower($toTransformer); $context = $this; $filters[$name] = - new \Twig_SimpleFilter($name, function ($word) use ($context, $fromTransformer, $toTransformer) { + new TwigFilter($name, function ($word) use ($context, $fromTransformer, $toTransformer) { return $context->transform($word, $fromTransformer, $toTransformer); }); }