Add Symfony security components as an optional dependency

SolidWorx · Oct 5, 2018 · cc16ee1 · cc16ee1
1 parent dabc94f
commit cc16ee1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -16,11 +16,13 @@
         "symfony/property-access": "^3.0 || ^4.0"
     },
     "suggest": {
-        "symfony/framework-bundle": "For Symfony integration"
+        "symfony/framework-bundle": "For Symfony integration",
+        "symfony/security": "To load security functions for expressions"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.3",
-        "symfony/framework-bundle": "^3,0 || ^4.0"
+        "symfony/framework-bundle": "^3,0 || ^4.0",
+        "symfony/security": "^3,0 || ^4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Symfony/DependencyInjection/RulerExtension.php b/src/Symfony/DependencyInjection/RulerExtension.php
@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
@@ -34,14 +35,17 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $this->processRules($config['rules'], $container);
+        try {
+            $this->processRules($config['rules'], $container);
+        } catch (Exception\BadMethodCallException | Exception\InvalidArgumentException $e) {
+        }
     }
 
     /**
      * @param array            $rules
      * @param ContainerBuilder $container
      *
-     * @throws DependencyInjection\Exception\BadMethodCallException|DependencyInjection\Exception\InvalidArgumentException
+     * @throws Exception\InvalidArgumentException|Exception\BadMethodCallException
      */
     private function processRules(array $rules, ContainerBuilder $container): void
     {
@@ -62,7 +66,7 @@ private function processRules(array $rules, ContainerBuilder $container): void
      * @param array $rules
      *
      * @return Definition
-     * @throws DependencyInjection\Exception\InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     private function getRuleDefinition(array $rules): Definition
     {
@@ -103,9 +107,12 @@ private function getExpressionLanguage(): Definition
     {
         $providers = [
             new Definition(DependencyInjection\ExpressionLanguageProvider::class),
-            new Definition(Security\ExpressionLanguageProvider::class),
         ];
 
+        if (class_exists(Security\ExpressionLanguageProvider::class)) {
+            $providers[] = new Definition(Security\ExpressionLanguageProvider::class);
+        }
+
         return new Definition(ExpressionLanguage::class, [null, $providers]);
     }
 }