[Workflow] Added inheritance to 'GuardListener'

ochretien · ochretien · commit b97ef817280e · 2019-01-03T11:55:15.000+01:00
diff --git a/src/Symfony/Component/Workflow/CHANGELOG.md b/src/Symfony/Component/Workflow/CHANGELOG.md
@@ -8,6 +8,7 @@ CHANGELOG
  * Added support for `Event::getWorkflowName()` for "announce" events.
  * Added `workflow.completed` events which are fired after a transition is completed.
  * Added `guard_listener` configuration option along with `workflow.guard_listener` parameter.
+ * Added inheritance to `GuardListener`.
 
 3.3.0
 -----
diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php
@@ -24,13 +24,13 @@
  */
 class GuardListener
 {
-    private $configuration;
-    private $expressionLanguage;
-    private $tokenStorage;
-    private $authorizationChecker;
-    private $trustResolver;
-    private $roleHierarchy;
-    private $validator;
+    protected $configuration;
+    protected $expressionLanguage;
+    protected $tokenStorage;
+    protected $authorizationChecker;
+    protected $trustResolver;
+    protected $roleHierarchy;
+    protected $validator;
 
     public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
     {
@@ -62,15 +62,15 @@ public function onTransition(GuardEvent $event, $eventName)
         }
     }
 
-    private function validateGuardExpression(GuardEvent $event, $expression)
+    protected function validateGuardExpression(GuardEvent $event, $expression)
     {
         if (!$this->expressionLanguage->evaluate($expression, $this->getVariables($event))) {
             $event->setBlocked(true);
         }
     }
 
     // code should be sync with Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter
-    private function getVariables(GuardEvent $event)
+    protected function getVariables(GuardEvent $event)
     {
         $token = $this->tokenStorage->getToken();
 

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@`
`24`	`24`	`*/`
`25`	`25`	`class GuardListener`
`26`	`26`	`{`
`27`		`- private $configuration;`
`28`		`- private $expressionLanguage;`
`29`		`- private $tokenStorage;`
`30`		`- private $authorizationChecker;`
`31`		`- private $trustResolver;`
`32`		`- private $roleHierarchy;`
`33`		`- private $validator;`
	`27`	`+ protected $configuration;`
	`28`	`+ protected $expressionLanguage;`
	`29`	`+ protected $tokenStorage;`
	`30`	`+ protected $authorizationChecker;`
	`31`	`+ protected $trustResolver;`
	`32`	`+ protected $roleHierarchy;`
	`33`	`+ protected $validator;`
`34`	`34`
`35`	`35`	`public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)`
`36`	`36`	`{`
`@@ -62,15 +62,15 @@ public function onTransition(GuardEvent $event, $eventName)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- private function validateGuardExpression(GuardEvent $event, $expression)`
	`65`	`+ protected function validateGuardExpression(GuardEvent $event, $expression)`
`66`	`66`	`{`
`67`	`67`	`if (!$this->expressionLanguage->evaluate($expression, $this->getVariables($event))) {`
`68`	`68`	`$event->setBlocked(true);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// code should be sync with Symfony\Component\Security\Core\Authorization\Voter\ExpressionVoter`
`73`		`- private function getVariables(GuardEvent $event)`
	`73`	`+ protected function getVariables(GuardEvent $event)`
`74`	`74`	`{`
`75`	`75`	`$token = $this->tokenStorage->getToken();`
`76`	`76`