bug #35028 [TwigBridge] Fix invalid typehint for subject in is_granted Twig function (emodric)

nicolas-grekas · nicolas-grekas · commit edac0cedadaf · 2019-12-18T22:35:07.000+01:00
This PR was merged into the 5.0 branch. Discussion ---------- [TwigBridge] Fix invalid typehint for subject in is_granted Twig function | Q | A | ------------- | --- | Branch? | 5.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35026 | License | MIT | Doc PR | N/A Twig function `is_granted` does not accept `mixed` any more for its second argument, instead requiring `object` or `null` with a PHP typehint. `AuthorizationCheckerInterface::isGranted`, where this argument is passed, has no typehint in code and is typehinted as `mixed` in PHPDoc. This makes it impossible to have a check in Twig template with code similar to this: `{% if is_granted('ROLE_MY_APP', {foo: 'bar', bar: 'baz'}) %}...{% endif %}` Commits ------- d3d86ce Fix invalid typehint for subject in is_granted Twig function
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -31,7 +31,10 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul
         $this->securityChecker = $securityChecker;
     }
 
-    public function isGranted($role, object $object = null, string $field = null): bool
+    /**
+     * @param mixed $object
+     */
+    public function isGranted($role, $object = null, string $field = null): bool
     {
         if (null === $this->securityChecker) {
             return false;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,10 @@ public function __construct(AuthorizationCheckerInterface $securityChecker = nul`
`31`	`31`	`$this->securityChecker = $securityChecker;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function isGranted($role, object $object = null, string $field = null): bool`
	`34`	`+ /**`
	`35`	`+ * @param mixed $object`
	`36`	`+ */`
	`37`	`+ public function isGranted($role, $object = null, string $field = null): bool`
`35`	`38`	`{`
`36`	`39`	`if (null === $this->securityChecker) {`
`37`	`40`	`return false;`