[Security] Notify that symfony/expression-language is not installed if ExpressionLanguage and ExpressionLanguagePrivider are used

giovannialbero1992 · giovannialbero1992 · commit abbe5b7f4631 · 2018-01-17T16:09:06.000+01:00
diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguage.php
@@ -13,6 +13,10 @@
 
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 
+if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
+    throw new \LogicException('Install symfony/expression-language');
+}
+
 /**
  * Adds some function to the default ExpressionLanguage.
  *
diff --git a/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php b/src/Symfony/Component/Security/Core/Authorization/ExpressionLanguageProvider.php
@@ -14,6 +14,10 @@
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
 use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 
+if (!interface_exists('Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface')) {
+    throw new \LogicException('Install symfony/expression-language');
+}
+
 /**
  * Define some ExpressionLanguage functions.
  *

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;`
`15`	`15`
	`16`	`+if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {`
	`17`	`+ throw new \LogicException('Install symfony/expression-language');`
	`18`	`+}`
	`19`	`+`
`16`	`20`	`/**`
`17`	`21`	`* Adds some function to the default ExpressionLanguage.`
`18`	`22`	`*`