Skip to content

Symfony 5.x compat #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aless673 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Symfony 5.x compat #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2483ce
[UPDATE] Symfony 5.x compat
aless673 Sep 3, 2021
f72de95
[FIX] PHP version + Twig functions
aless673 Sep 3, 2021
b2759cf
feat(composer): allow sf6
aless673 Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
composer.lock
/vendor/
phpunit.xml
.idea
9 changes: 2 additions & 7 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions Twig/Extension/RolloutExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

use Opensoft\Rollout\RolloutUserInterface;
use Opensoft\RolloutBundle\Rollout\GroupDefinitionAwareRollout;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;

/**
* @author Richard Fullmer <richard.fullmer@opensoftdev.com>
*/
class RolloutExtension extends \Twig_Extension
class RolloutExtension extends AbstractExtension
{
/**
* @var GroupDefinitionAwareRollout
Expand All @@ -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);
})
);
Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand All @@ -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": {
Expand Down