Skip to content

Compatibility update for current supported symfony versions. #3

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
jonmnoj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatibility update for current supported symfony versions. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ class Configuration implements ConfigurationInterface {
public function getConfigTreeBuilder() {

//Create tree builder
$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('combodo_doctrine_encrypt');
if (method_exists(TreeBuilder::class, 'getRootNode')) {
$treeBuilder = new TreeBuilder('combodo_doctrine_encrypt');
$rootNode = $treeBuilder->getRootNode();
} else {
$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('combodo_doctrine_encrypt');
}

// Grammar of config tree
$rootNode
Expand Down
4 changes: 2 additions & 2 deletions Twig/EncryptExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Combodo\DoctrineEncryptBundle\Services\EncryptorInterface;


class EncryptExtension extends \Twig_Extension
class EncryptExtension extends \Twig\Extension\AbstractExtension
{

private $encryptor;
Expand All @@ -19,7 +19,7 @@ public function __construct(EncryptorInterface $encryptor)
public function getFilters()
{
return [
new \Twig_SimpleFilter('decrypt', [$this,'decrypt'], [
new \Twig\TwigFilter('decrypt', [$this,'decrypt'], [
//'is_safe' => ['html'],//to avoid autoescaping of HTML
]),

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
Expand Up @@ -3,10 +3,10 @@
"type": "library",
"keywords": ["doctrine", "symfony", "aes256", "openssl", "encrypt", "decrypt", "bundle"],
"license": "MIT",
"description": "Symfony 2 bundle which allows to encrypt data in database with some encrypt algorithm, this fork make use of open ssl",
"description": "Symfony 3+ bundle which allows to encrypt data in database with some encrypt algorithm, this fork make use of open ssl",
"require": {
"php": ">=5.4",
"symfony/framework-bundle": ">=2.5",
"php": ">=5.5.9",
"symfony/framework-bundle": "^3.4|>=4.4",
"doctrine/orm": ">=2.5",
"ext-openssl": "*"
},
Expand Down