8000 [Security] Notify that symfony/expression-language is not installed if ExpressionLanguage is used by giovannialbero1992 · Pull Request #25823 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] Notify that symfony/expression-language is not installed if ExpressionLanguage is used #25823

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

Merged
merged 1 commit into from
Jan 18, 2018
Merged

[Security] Notify that symfony/expression-language is not installed if ExpressionLanguage is used #25823

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
[Security] Notify that symfony/expression-language is not installed i… 
…f ExpressionLanguage and ExpressionLanguagePrivider are used
  • Loading branch information
@giovannialbero1992
giovannialbero1992 committed Jan 18, 2018
commit 6aa2b7cce071aaef5d0d95beb2d60c5aa05b413e
32 changes: 18 additions & 14 deletions src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,27 @@

use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;

/**
* Adds some function to the default ExpressionLanguage.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @see ExpressionLanguageProvider
*/
class ExpressionLanguage extends BaseExpressionLanguage
{
if (!class_exists(BaseExpressionLanguage::class)) {
throw new \LogicException(sprintf('The "%s" class requires the "ExpressionLanguage" component. Try running "composer require symfony/expression-language".', ExpressionLanguage::class));
} else {
/**
* {@inheritdoc}
* Adds some function to the default ExpressionLanguage.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @see ExpressionLanguageProvider
*/
public function __construct($cache = null, array $providers = array())
class ExpressionLanguage extends BaseExpressionLanguage
{
// prepend the default provider to let users override it easily
array_unshift($providers, new ExpressionLanguageProvider());
/**
* {@inheritdoc}
*/
public function __construct($cache = null, array $providers = array())
{
// prepend the default provider to let users override it easily
array_unshift($providers, new ExpressionLanguageProvider());

parent::__construct($cache, $providers);
parent::__construct($cache, $providers);
}
}
}
0