RE #193: Added default values

Ignore $authorizationChecker is not initilized
excelwebzone · Feb 23, 2018 · ae542b3 · ae542b3
1 parent 3e6ff3b
commit ae542b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,7 +28,7 @@ public function getConfigTreeBuilder()
                 ->booleanNode('ajax')->defaultFalse()->end()
                 ->scalarNode('locale_key')->defaultValue('%kernel.default_locale%')->end()
                 ->booleanNode('locale_from_request')->defaultFalse()->end()
-				->arrayNode('trusted_roles')->prototype('scalar')->end()
+				->arrayNode('trusted_roles')->prototype('scalar')->treatNullLike(array())->end()
             ->end()
         ;
 

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -27,7 +27,7 @@ services:
             - '@request_stack'
             - '%ewz_recaptcha.http_proxy%'
             - '%ewz_recaptcha.verify_host%'
-            - '@security.authorization_checker'
+            - '@?security.authorization_checker'
             - '%ewz_recaptcha.trusted_roles%'
         tags:
             - { name: validator.constraint_validator, alias: 'ewz_recaptcha.true' }
diff --git a/src/Validator/Constraints/IsTrueValidator.php b/src/Validator/Constraints/IsTrueValidator.php
@@ -65,13 +65,22 @@ class IsTrueValidator extends ConstraintValidator
     const RECAPTCHA_VERIFY_SERVER = 'https://www.google.com';
 
     /**
-     * @param bool         $enabled
-     * @param string       $privateKey
-     * @param RequestStack $requestStack
-     * @param array        $httpProxy
-     * @param bool         $verifyHost
+     * @param bool                               $enabled
+     * @param string                             $privateKey
+     * @param RequestStack                       $requestStack
+     * @param array                              $httpProxy
+     * @param bool                               $verifyHost
+     * @param AuthorizationCheckerInterface|null $authorizationChecker
+     * @param array                              $trusted_roles
      */
-    public function __construct($enabled, $privateKey, RequestStack $requestStack, array $httpProxy, $verifyHost, AuthorizationCheckerInterface $authorizationChecker, $trusted_roles)
+    public function __construct(
+        $enabled,
+        $privateKey,
+        RequestStack $requestStack,
+        array $httpProxy,
+        $verifyHost,
+        AuthorizationCheckerInterface $authorizationChecker = null,
+        array $trusted_roles = array())
     {
         $this->enabled = $enabled;
         $this->privateKey = $privateKey;
@@ -93,7 +102,7 @@ public function validate($value, Constraint $constraint)
         }
 
         // if we have an authorized role
-        if ($this->authorizationChecker->isGranted($this->trusted_roles)) {
+        if ($this->authorizationChecker && $this->authorizationChecker->isGranted($this->trusted_roles)) {
             return true;
         }