Compare commits

..

2 Commits

20 changed files with 74 additions and 79 deletions

View File

@@ -32,46 +32,46 @@
"ramsey/uuid-doctrine": "^1.7",
"sensio/framework-extra-bundle": "^6.0",
"spomky-labs/base64url": "^2.0",
"symfony/asset": "6.0.*",
"symfony/browser-kit": "6.0.*",
"symfony/cache": "6.0.*",
"symfony/asset": "6.4.*",
"symfony/browser-kit": "6.4.*",
"symfony/cache": "6.4.*",
"symfony/clock": "^6.2",
"symfony/config": "^6.0",
"symfony/console": "6.0.*",
"symfony/css-selector": "6.0.*",
"symfony/dom-crawler": "6.0.*",
"symfony/error-handler": "6.0.*",
"symfony/event-dispatcher": "6.0.*",
"symfony/expression-language": "6.0.*",
"symfony/filesystem": "6.0.*",
"symfony/finder": "6.0.*",
"symfony/form": "6.0.*",
"symfony/framework-bundle": "6.0.*",
"symfony/http-client": "6.0.*",
"symfony/http-foundation": "6.0.*",
"symfony/intl": "6.0.*",
"symfony/mailer": "6.0.*",
"symfony/messenger": "6.0.*",
"symfony/mime": "6.0.*",
"symfony/config": "^6.4",
"symfony/console": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/dom-crawler": "6.4.*",
"symfony/error-handler": "6.4.*",
"symfony/event-dispatcher": "6.4.*",
"symfony/expression-language": "6.4.*",
"symfony/filesystem": "6.4.*",
"symfony/finder": "6.4.*",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/http-foundation": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/messenger": "6.4.*",
"symfony/mime": "6.4.*",
"symfony/monolog-bundle": "^3.5",
"symfony/options-resolver": "6.0.*",
"symfony/process": "6.0.*",
"symfony/property-access": "6.0.*",
"symfony/property-info": "6.0.*",
"symfony/routing": "6.0.*",
"symfony/security-bundle": "^6.0",
"symfony/security-core": "6.0.*",
"symfony/security-csrf": "6.0.*",
"symfony/security-http": "6.0.*",
"symfony/serializer": "6.0.*",
"symfony/string": "6.0.*",
"symfony/templating": "6.0.*",
"symfony/translation": "6.0.*",
"symfony/twig-bundle": "6.0.*",
"symfony/validator": "6.0.*",
"symfony/options-resolver": "6.4.*",
"symfony/process": "6.4.*",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/routing": "6.4.*",
"symfony/security-bundle": "^6.4",
"symfony/security-core": "6.4.*",
"symfony/security-csrf": "6.4.*",
"symfony/security-http": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/string": "6.4.*",
"symfony/templating": "6.4.*",
"symfony/translation": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/webpack-encore-bundle": "^1.11",
"symfony/workflow": "6.0.*",
"symfony/yaml": "6.0.*",
"symfony/workflow": "6.4.*",
"symfony/yaml": "6.4.*",
"thenetworg/oauth2-azure": "^2.0",
"twig/extra-bundle": "^3.0",
"twig/intl-extra": "^3.0",
@@ -92,13 +92,13 @@
"phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^10.5.24",
"rector/rector": "^1.1.0",
"symfony/debug-bundle": "6.0.*",
"symfony/dotenv": "6.0.*",
"symfony/debug-bundle": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/maker-bundle": "^1.20",
"symfony/phpunit-bridge": "^7.1",
"symfony/runtime": "6.0.*",
"symfony/stopwatch": "6.0.*",
"symfony/var-dumper": "6.0.*"
"symfony/runtime": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "6.4.*"
},
"conflict": {
"symfony/symfony": "*"
@@ -155,7 +155,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.0.*"
"require": "6.4.*"
}
}
}

View File

@@ -53,13 +53,13 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $this->helper->supports($attribute, $subject);
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
return $this->helper->voteOnAttribute($attribute, $subject, $token);
}

View File

@@ -68,13 +68,13 @@ class BudgetElementVoter extends Voter implements ProvideRoleHierarchyInterface
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $this->voter->supports($attribute, $subject);
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
if (
$subject instanceof Person

View File

@@ -74,7 +74,7 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $this->voterHelper->supports($attribute, $subject);
}
@@ -86,7 +86,7 @@ class PersonDocumentVoter extends AbstractChillVoter implements ProvideRoleHiera
* @return bool
*/
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
$this->logger->debug(sprintf('Voting from %s class', self::class));

View File

@@ -82,13 +82,13 @@ class EventVoter extends AbstractChillVoter implements ProvideRoleHierarchyInter
}
#[\Override]
public function supports($attribute, $subject)
public function supports($attribute, $subject): bool
{
return $this->voterHelper->supports($attribute, $subject);
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
$this->logger->debug(sprintf('Voting from %s class', self::class));

View File

@@ -79,18 +79,13 @@ class ParticipationVoter extends AbstractChillVoter implements ProvideRoleHierar
}
#[\Override]
public function supports($attribute, $subject)
public function supports($attribute, $subject): bool
{
return $this->voterHelper->supports($attribute, $subject);
}
/**
* @param string $attribute
*
* @return bool
*/
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
$this->logger->debug(sprintf('Voting from %s class', self::class));

View File

@@ -46,7 +46,7 @@ class ExportsJobVoter extends AbstractChillVoter implements ProvideRoleHierarchy
* @return bool
*/
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
if ($subject instanceof Center) {
return self::EXPORT === $attribute;
@@ -62,7 +62,7 @@ class ExportsJobVoter extends AbstractChillVoter implements ProvideRoleHierarchy
* @return bool
*/
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
$user = $token->getUser();

View File

@@ -50,7 +50,7 @@ class JobVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterfa
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
if (!\in_array($attribute, self::ALL, true)) {
return false;
@@ -68,7 +68,7 @@ class JobVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterfa
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
if ($subject instanceof Person) {
$center = $subject->getCenter();

View File

@@ -30,7 +30,7 @@ class EntityWorkflowVoter extends Voter
public function __construct(private readonly EntityWorkflowManager $manager, private readonly Security $security) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $subject instanceof EntityWorkflow && \in_array($attribute, self::getRoles(), true);
}

View File

@@ -23,7 +23,7 @@ class WorkflowEntityDeletionVoter extends Voter
public function __construct(private $handlers, private readonly EntityWorkflowRepository $entityWorkflowRepository) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
if (!\is_object($subject)) {
return false;
@@ -40,7 +40,7 @@ class WorkflowEntityDeletionVoter extends Voter
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
foreach ($this->handlers as $handler) {
if ($handler->isObjectSupported($subject)) {

View File

@@ -625,7 +625,7 @@ class AccompanyingPeriod implements
}
#[\Override]
public function getGroupSequence()
public function getGroupSequence(): array|Assert\GroupSequence
{
if (self::STEP_DRAFT === $this->getStep()) {
return [[self::STEP_DRAFT]];

View File

@@ -25,13 +25,13 @@ class AccompanyingPeriodCommentVoter extends Voter
public function __construct(private readonly Security $security) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $subject instanceof Comment;
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
return match ($attribute) {
self::EDIT => $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod()),

View File

@@ -23,13 +23,13 @@ class AccompanyingPeriodResourceVoter extends Voter
public function __construct(private readonly AccessDecisionManagerInterface $accessDecisionManager) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $subject instanceof Resource && self::EDIT === $attribute;
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
return match ($attribute) {
self::EDIT => $this->accessDecisionManager->decide(

View File

@@ -151,7 +151,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $this->voterHelper->supports($attribute, $subject);
}

View File

@@ -28,7 +28,7 @@ class AccompanyingPeriodWorkEvaluationDocumentVoter extends Voter
public function __construct(private readonly AccessDecisionManagerInterface $accessDecisionManager) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $subject instanceof AccompanyingPeriodWorkEvaluationDocument
&& self::SEE === $attribute;

View File

@@ -31,7 +31,7 @@ class AccompanyingPeriodWorkEvaluationVoter extends Voter implements ChillVoterI
public function __construct(private readonly Security $security) {}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return $subject instanceof AccompanyingPeriodWorkEvaluation
&& \in_array($attribute, self::ALL, true);

View File

@@ -70,7 +70,7 @@ class HouseholdVoter extends Voter implements ProvideRoleHierarchyInterface, Chi
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
return ($subject instanceof Household
&& \in_array($attribute, self::ALL, true))

View File

@@ -58,7 +58,7 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
if ($subject instanceof Report) {
return \in_array($attribute, [
@@ -72,7 +72,7 @@ class ReportVoter extends AbstractChillVoter implements ProvideRoleHierarchyInte
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
if (!$token->getUser() instanceof User) {
return false;

View File

@@ -84,13 +84,13 @@ final class TaskVoter extends AbstractChillVoter implements ProvideRoleHierarchy
}
#[\Override]
public function supports($attribute, $subject)
public function supports($attribute, $subject): bool
{
return $this->voter->supports($attribute, $subject);
}
#[\Override]
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
{
if (!$token->getUser() instanceof User) {
return false;

View File

@@ -62,7 +62,7 @@ class ThirdPartyVoter extends AbstractChillVoter implements ProvideRoleHierarchy
}
#[\Override]
protected function supports($attribute, $subject)
protected function supports($attribute, $subject): bool
{
if ($subject instanceof ThirdParty) {
return \in_array($attribute, $this->getRoles(), true);