Merge pull request #2 from MyOnlineStore/update-twig

fix twig deprecations and upgrade twig to ~2|~3

Author: Frank Verhoeven

.gitignore

@@ -6,3 +6,4 @@ clover.xml
 /vendor/
 /Tests/cache
 /Tests/log
+.phpunit.result.cache

DependencyInjection/Configuration.php

@@ -25,8 +25,8 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode    = $treeBuilder->root('fm_bbcode', 'array');
+        $treeBuilder = new TreeBuilder('fm_bbcode');
+        $rootNode    = $treeBuilder->getRootNode();
 
         $rootNode
             ->children()

Templating/BbcodeExtension.php

@@ -2,15 +2,18 @@
 
 namespace FM\BbcodeBundle\Templating;
 
+use FM\BbcodeBundle\Decoda\DecodaManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use FM\BbcodeBundle\Decoda\DecodaManager as DecodaManager;
+use Twig\Error\RuntimeError;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
 
 /**
- * @author Al Ganiev <helios.ag@gmail.com>
+ * @author    Al Ganiev <helios.ag@gmail.com>
  * @copyright 2012-2015 Al Ganiev
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT License
  */
-class BbcodeExtension extends \Twig_Extension
+class BbcodeExtension extends AbstractExtension
 {
     /**
      * @var DecodaManager
@@ -26,20 +29,22 @@ public function __construct(DecodaManager $decodaManager)
     }
 
     /**
-     * (non-PHPdoc).
+     * Strip tags.
      *
-     * @see Twig_Extension::getFilters()
+     * @param $value
+     * @param $filterSet
      *
-     * @return array
+     * @return string
+     *
+     * @throws RuntimeError
      */
-    public function getFilters()
+    public function clean($value, $filterSet = DecodaManager::DECODA_DEFAULT)
     {
-        $options = array('is_safe' => array('html'));
+        if (!is_string($value)) {
+            throw new RuntimeError('The filter can be applied to strings only.');
+        }
 
-        return array(
-            new \Twig_SimpleFilter('bbcode_filter', array($this, 'filter'), $options),
-            new \Twig_SimpleFilter('bbcode_clean', array($this, 'clean'), $options),
-        );
+        return $this->decodaManager->get($value, $filterSet)->strip(true);
     }
 
     /**
@@ -49,40 +54,38 @@ public function getFilters()
      * @return string
      * @return \FM\BbcodeBundle\Decoda\Decoda
      *
-     * @throws \Twig_Error_Runtime
+     * @throws RuntimeError
      */
     public function filter($value, $filterSet = DecodaManager::DECODA_DEFAULT)
     {
         if (!is_string($value)) {
-            throw new \Twig_Error_Runtime('The filter can be applied to strings only.');
+            throw new RuntimeError('The filter can be applied to strings only.');
         }
 
         return $this->decodaManager->get($value, $filterSet)->parse();
     }
 
     /**
-     * Strip tags.
-     *
-     * @param $value
-     * @param $filterSet
+     * (non-PHPdoc).
      *
-     * @return string
+     * @return array
+     * @see AbstractExtension::getFilters()
      *
-     * @throws \Twig_Error_Runtime
      */
-    public function clean($value, $filterSet = DecodaManager::DECODA_DEFAULT)
+    public function getFilters()
     {
-        if (!is_string($value)) {
-            throw new \Twig_Error_Runtime('The filter can be applied to strings only.');
-        }
+        $options = ['is_safe' => ['html']];
 
-        return $this->decodaManager->get($value, $filterSet)->strip(true);
+        return [
+            new TwigFilter('bbcode_filter', [$this, 'filter'], $options),
+            new TwigFilter('bbcode_clean', [$this, 'clean'], $options),
+        ];
     }
 
     /**
      * (non-PHPdoc).
      *
-     * @see Twig_ExtensionInterface::getName()
+     * @see AbstractExtension::getName()
      */
     public function getName()
     {

Templating/Helper/BbcodeHelper.php

@@ -4,7 +4,8 @@
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Templating\Helper\Helper;
-use FM\BbcodeBundle\Decoda\DecodaManager as DecodaManager;
+use FM\BbcodeBundle\Decoda\DecodaManager;
+use Twig\Error\RuntimeError;
 
 /**
  * @author Al Ganiev <helios.ag@gmail.com>
@@ -32,12 +33,12 @@ public function __construct(DecodaManager $decodaManager)
      *
      * @return string
      *
-     * @throws \Twig_Error_Runtime
+     * @throws RuntimeError
      */
     public function filter($value, $filterSet = DecodaManager::DECODA_DEFAULT)
     {
         if (!is_string($value)) {
-            throw new \Twig_Error_Runtime('The filter can be applied to strings only.');
+            throw new RuntimeError('The filter can be applied to strings only.');
         }
 
         return $this->decodaManager->get($value, $filterSet)->parse();
@@ -51,12 +52,12 @@ public function filter($value, $filterSet = DecodaManager::DECODA_DEFAULT)
      *
      * @return string
      *
-     * @throws \Twig_Error_Runtime
+     * @throws RuntimeError
      */
     public function clean($value, $filterSet = DecodaManager::DECODA_DEFAULT)
     {
         if (!is_string($value)) {
-            throw new \Twig_Error_Runtime('The filter can be applied to strings only.');
+            throw new RuntimeError('The filter can be applied to strings only.');
         }
 
         return $this->decodaManager->get($value, $filterSet)->strip(true);

Tests/TwigBasedTestCase.php

@@ -3,6 +3,7 @@
 namespace FM\BbcodeBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Twig\Environment;
 
 /**
  * @author Christian Raue <christian.raue@gmail.com>
@@ -12,7 +13,7 @@
 abstract class TwigBasedTestCase extends WebTestCase
 {
     /**
-     * @var \Twig_Environment
+     * @var Environment
      */
     protected $twig;
 

composer.json

@@ -14,25 +14,26 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.2",
         "mjohnson/decoda": "6.*",
-        "symfony/twig-bundle": "~3.3|~4.0",
-        "symfony/config": "~3.3|~4.0",
-        "symfony/console": "~3.3|~4.0",
-        "symfony/dependency-injection": "~3.3|~4.0",
+        "symfony/twig-bundle": "~4.0",
+        "symfony/config": "~4.0",
+        "symfony/console": "~4.0",
+        "symfony/dependency-injection": "~4.0",
         "symfony/framework-bundle": "~3.2|~4.0",
         "symfony/http-foundation": "~3.2|~4.0",
-        "symfony/http-kernel": "~3.3|~4.0",
-        "symfony/process": "~3.3|~4.0",
-        "symfony/templating": "~3.3|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
-        "twig/twig": "^1.42"
+        "symfony/http-kernel": "~4.0",
+        "symfony/process": "~4.0",
+        "symfony/templating": "~4.0",
+        "symfony/yaml": "~4.0",
+        "twig/twig": "~2|~3"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "symfony/symfony": "~3.3|~4.0",
+        "symfony/symfony": "~4.0",
         "php-coveralls/php-coveralls": "~2.0",
-        "phpunit/phpunit": "~7.1"
+        "phpunit/phpunit": "~7.1",
+        "symfony/phpunit-bridge": "^5.1"
     },
     "autoload": {
         "psr-4": {