feature #24 Update Twig bridge (Jean85)

fabpot · fabpot · commit 03c69ea03b4e · 2020-05-26T10:39:32.000+02:00
This PR was merged into the 1.1-dev branch. Discussion ---------- Update Twig bridge This is a small PR to make the Twig bridge compatible with Twig 3.0 and deprecation free under 2.4+ Commits ------- 7c22b40 Update Twig bridge
diff --git a/SensioLabs/AnsiConverter/Bridge/Twig/AnsiExtension.php b/SensioLabs/AnsiConverter/Bridge/Twig/AnsiExtension.php
@@ -3,41 +3,45 @@
 namespace SensioLabs\AnsiConverter\Bridge\Twig;
 
 use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
-class AnsiExtension extends \Twig_Extension
+class AnsiExtension extends AbstractExtension
 {
+    /** @var AnsiToHtmlConverter */
     private $converter;
 
     public function __construct(AnsiToHtmlConverter $converter = null)
     {
         $this->converter = $converter ?: new AnsiToHtmlConverter();
     }
 
-    public function getFilters()
+    public function getFilters(): array
     {
-        return array(
-            new \Twig_SimpleFilter('ansi_to_html', array($this, 'ansiToHtml'), array('is_safe' => array('html'))),
-        );
+        return [
+            new TwigFilter('ansi_to_html', [$this, 'ansiToHtml'], ['is_safe' => ['html']]),
+        ];
     }
 
-    public function getFunctions()
+    public function getFunctions(): array
     {
-        return array(
-            new \Twig_SimpleFunction('ansi_css', array($this, 'css'), array('is_safe' => array('css'))),
-        );
+        return [
+            new TwigFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]),
+        ];
     }
 
     public function ansiToHtml($string)
     {
         return $this->converter->convert($string);
     }
 
-    public function css()
+    public function css(): string
     {
         return $this->converter->getTheme()->asCss();
     }
 
-    public function getName()
+    public function getName(): string
     {
         return 'sensiolabs_ansi';
     }
diff --git a/composer.json b/composer.json
@@ -10,17 +10,23 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.0"
+    },
+    "require-dev": {
+        "twig/twig": "^2.4 || ^3.0"
     },
     "suggest": {
         "twig/twig": "Provides nice templating features"
     },
+    "conflict": {
+        "twig/twig": "< 2.4.0"
+    },
     "autoload": {
         "psr-0": { "SensioLabs\\AnsiConverter": "." }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,41 +3,45 @@`
`3`	`3`	`namespace SensioLabs\AnsiConverter\Bridge\Twig;`
`4`	`4`
`5`	`5`	`use SensioLabs\AnsiConverter\AnsiToHtmlConverter;`
	`6`	`+use Twig\Extension\AbstractExtension;`
	`7`	`+use Twig\TwigFilter;`
	`8`	`+use Twig\TwigFunction;`
`6`	`9`
`7`		`-class AnsiExtension extends \Twig_Extension`
	`10`	`+class AnsiExtension extends AbstractExtension`
`8`	`11`	`{`
	`12`	`+ /** @var AnsiToHtmlConverter */`
`9`	`13`	`private $converter;`
`10`	`14`
`11`	`15`	`public function __construct(AnsiToHtmlConverter $converter = null)`
`12`	`16`	`{`
`13`	`17`	`$this->converter = $converter ?: new AnsiToHtmlConverter();`
`14`	`18`	`}`
`15`	`19`
`16`		`- public function getFilters()`
	`20`	`+ public function getFilters(): array`
`17`	`21`	`{`
`18`		`- return array(`
`19`		`- new \Twig_SimpleFilter('ansi_to_html', array($this, 'ansiToHtml'), array('is_safe' => array('html'))),`
`20`		`- );`
	`22`	`+ return [`
	`23`	`+ new TwigFilter('ansi_to_html', [$this, 'ansiToHtml'], ['is_safe' => ['html']]),`
	`24`	`+ ];`
`21`	`25`	`}`
`22`	`26`
`23`		`- public function getFunctions()`
	`27`	`+ public function getFunctions(): array`
`24`	`28`	`{`
`25`		`- return array(`
`26`		`- new \Twig_SimpleFunction('ansi_css', array($this, 'css'), array('is_safe' => array('css'))),`
`27`		`- );`
	`29`	`+ return [`
	`30`	`+ new TwigFunction('ansi_css', [$this, 'css'], ['is_safe' => ['css']]),`
	`31`	`+ ];`
`28`	`32`	`}`
`29`	`33`
`30`	`34`	`public function ansiToHtml($string)`
`31`	`35`	`{`
`32`	`36`	`return $this->converter->convert($string);`
`33`	`37`	`}`
`34`	`38`
`35`		`- public function css()`
	`39`	`+ public function css(): string`
`36`	`40`	`{`
`37`	`41`	`return $this->converter->getTheme()->asCss();`
`38`	`42`	`}`
`39`	`43`
`40`		`- public function getName()`
	`44`	`+ public function getName(): string`
`41`	`45`	`{`
`42`	`46`	`return 'sensiolabs_ansi';`
`43`	`47`	`}`