diff --git a/.gitignore b/.gitignore index 95f9096..85f75df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ composer.lock /vendor/ phpunit.xml +.idea diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 9a0b613..b6fd49a 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -17,13 +17,8 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - if (method_exists(TreeBuilder::class, 'getRootNode')) { - $treeBuilder = new TreeBuilder('opensoft_rollout'); - $rootNode = $treeBuilder->getRootNode(); - } else { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('opensoft_rollout'); - } + $treeBuilder = new TreeBuilder('opensoft_rollout'); + $rootNode = $treeBuilder->getRootNode(); // Here you should define the parameters that are allowed to // configure your bundle. See the documentation linked above for diff --git a/Twig/Extension/RolloutExtension.php b/Twig/Extension/RolloutExtension.php index 1d8cf56..9f01803 100644 --- a/Twig/Extension/RolloutExtension.php +++ b/Twig/Extension/RolloutExtension.php @@ -4,11 +4,13 @@ use Opensoft\Rollout\RolloutUserInterface; use Opensoft\RolloutBundle\Rollout\GroupDefinitionAwareRollout; +use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; /** * @author Richard Fullmer */ -class RolloutExtension extends \Twig_Extension +class RolloutExtension extends AbstractExtension { /** * @var GroupDefinitionAwareRollout @@ -31,7 +33,7 @@ public function __construct(GroupDefinitionAwareRollout $rollout) public function getFunctions() { return array( - new \Twig_SimpleFunction('rollout_is_active', function ($feature, RolloutUserInterface $user = null) { + new TwigFunction('rollout_is_active', function ($feature, RolloutUserInterface $user = null) { return $this->rollout->isActive($feature, $user); }) ); diff --git a/composer.json b/composer.json index df0a31c..507d87e 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "opensoft/rollout-bundle", - "description": "A Symfony2/3/4 Bundle for opensoft/rollout", + "description": "A Symfony2/3/4/5/6 Bundle for opensoft/rollout", "license": "MIT", "authors": [ { @@ -9,8 +9,8 @@ } ], "require": { - "php": ">=5.3", - "symfony/framework-bundle": "~2.1|^3.0|^4.0", + "php": ">=5.4", + "symfony/framework-bundle": "~2.1|^3.0|^4.0|^5.0|^6.0", "opensoft/rollout": "~2.1" }, "require-dev": {