Skip to content

Commit 0786df6

Browse files
committed
feature sensiolabs#440 added support for ClassExistenceResource (fabpot)
This PR was merged into the 4.0.x-dev branch. Discussion ---------- added support for ClassExistenceResource depends on symfony/symfony#20121 Commits ------- a1f987d added support for ClassExistenceResource
2 parents 0564621 + a1f987d commit 0786df6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Diff for: DependencyInjection/SensioFrameworkExtraExtension.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
1818
use Symfony\Component\Config\FileLocator;
19+
use Symfony\Component\Config\Resource\ClassExistenceResource;
20+
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
21+
use Symfony\Component\Security\Core\Authorization\ExpressionLanguage as SecurityExpressionLanguage;
1922

2023
/**
2124
* @author Fabien Potencier <[email protected]>
@@ -42,7 +45,8 @@ public function load(array $configs, ContainerBuilder $container)
4245
if ($config['request']['converters']) {
4346
$annotationsToLoad[] = 'converters.xml';
4447

45-
if (class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
48+
$container->addResource(new ClassExistenceResource(ExpressionLanguage::class));
49+
if (class_exists(ExpressionLanguage::class)) {
4650
$container->setAlias('sensio_framework_extra.converter.doctrine.orm.expression_language', new Alias('sensio_framework_extra.converter.doctrine.orm.expression_language.default', false));
4751
} else {
4852
$container->removeDefinition('sensio_framework_extra.converter.doctrine.orm.expression_language.default');
@@ -78,7 +82,8 @@ public function load(array $configs, ContainerBuilder $container)
7882
if ($config['security']['annotations']) {
7983
$annotationsToLoad[] = 'security.xml';
8084

81-
if (class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage') && class_exists('Symfony\Component\Security\Core\Authorization\ExpressionLanguage')) {
85+
$container->addResource(new ClassExistenceResource(SecurityExpressionLanguage::class));
86+
if (class_exists(ExpressionLanguage::class) && class_exists(SecurityExpressionLanguage::class)) {
8287
$container->setAlias('sensio_framework_extra.security.expression_language', new Alias($config['security']['expression_language'], false));
8388
} else {
8489
$container->removeDefinition('sensio_framework_extra.security.expression_language.default');

Diff for: composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
}
1212
],
1313
"require": {
14+
"symfony/config": "^3.2",
1415
"symfony/framework-bundle": "^3.1",
1516
"symfony/dependency-injection": "~3.0",
1617
"symfony/http-kernel": "^3.1",

0 commit comments

Comments
 (0)