Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-10-24 22:23:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Rector php82 changes

Browse Source
This commit is contained in:
Julie Lenaerts
2025-10-02 16:19:16 +02:00
parent f2922018ce
commit 4a08de09b8
18 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rector.php
View File

@@ -51,7 +51,7 @@ return static function (RectorConfig $rectorConfig): void {
// define sets of rules
$rectorConfig->sets([
// LevelSetList::UP_TO_PHP_82,
LevelSetList::UP_TO_PHP_82,
// SymfonySetList::SYMFONY_60,
// SymfonySetList::SYMFONY_61,
// SymfonySetList::SYMFONY_62,
@@ -59,10 +59,10 @@ return static function (RectorConfig $rectorConfig): void {
// SymfonySetList::SYMFONY_64,
// SymfonySetList::SYMFONY_70,
// SymfonySetList::SYMFONY_71,
Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_ORM_29,
Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_DBAL_30,
Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
// Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_ORM_29,
// Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_DBAL_30,
// Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
// Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
]);
$rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [

2
src/Bundle/ChillActivityBundle/Entity/ActivityType.php
View File

@@ -462,7 +462,7 @@ class ActivityType
$property = $field.'Visible';
// Get the real class name (not the proxy)
$class = get_class($this);
$class = static::class;
if (str_contains($class, '__CG__')) {
$class = get_parent_class($this);
}

4
src/Bundle/ChillEventBundle/Form/EventBudgetKindType.php
View File

@@ -25,7 +25,7 @@ class EventBudgetKindType extends AbstractType
{
public function __construct(private readonly TranslatorInterface $translator) {}
public function buildForm(FormBuilderInterface $builder, array $options)
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('name', TranslatableStringFormType::class, [
@@ -45,7 +45,7 @@ class EventBudgetKindType extends AbstractType
]);
}
public function configureOptions(OptionsResolver $resolver)
public function configureOptions(OptionsResolver $resolver): void
{
$resolver
->setDefault('class', EventBudgetKind::class);

2
src/Bundle/ChillEventBundle/Form/Type/PickEventThemeType.php
View File

@@ -22,7 +22,7 @@ class PickEventThemeType extends AbstractType
{
public function __construct(private readonly EventThemeRender $eventThemeRender, private readonly EventThemeRepository $eventThemeRepository) {}
public function configureOptions(OptionsResolver $resolver)
public function configureOptions(OptionsResolver $resolver): void
{
$resolver
->setDefaults([

2
src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
View File

@@ -52,7 +52,7 @@ class SetPasswordCommand extends Command
$user->setPassword(
$encoderFactory->getEncoder($user)->encodePassword($password, $user->getSalt())
);
$this->entityManager->flush($user);
$this->entityManager->flush();
}
public function configure(): void

2
src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadCountries.php
View File

@@ -22,7 +22,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
*/
class LoadCountries extends Fixture implements OrderedFixtureInterface
{
private array $availableLanguages;
private readonly array $availableLanguages;
public function __construct(private readonly ParameterBagInterface $parameterBag)
{

2
src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
View File

@@ -30,7 +30,7 @@ class LoadLanguages extends Fixture implements OrderedFixtureInterface
// This array contains regional code to not exclude
private array $regionalVersionToInclude = ['ro_MD'];
private array $availableLanguages;
private readonly array $availableLanguages;
public function __construct(private readonly ParameterBagInterface $parameterBag)
{

5
src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
View File

@@ -54,11 +54,8 @@ class LoadUsers extends Fixture implements OrderedFixtureInterface
],
];
private UserPasswordHasherInterface $passwordHasher;
public function __construct(UserPasswordHasherInterface $passwordHasher)
public function __construct(private readonly UserPasswordHasherInterface $passwordHasher)
{
$this->passwordHasher = $passwordHasher;
}
public function getOrder(): int

5
src/Bundle/ChillMainBundle/Doctrine/Event/TrackCreateUpdateSubscriber.php
View File

@@ -22,11 +22,8 @@ use Symfony\Bundle\SecurityBundle\Security;
class TrackCreateUpdateSubscriber implements EventSubscriber
{
private Security $security;
public function __construct(Security $security)
public function __construct(private readonly Security $security)
{
$this->security = $security;
}
public function getSubscribedEvents(): array

2
src/Bundle/ChillMainBundle/Tests/Entity/UserTest.php
View File

@@ -68,7 +68,7 @@ class UserTest extends TestCase
);
}
public function testIsAbsent()
public function testIsAbsent(): void
{
$user = new User();

2
src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
View File

@@ -57,7 +57,7 @@ final class UserNormalizerTest extends TestCase
return ['context' => $context['docgen:expects'] ?? null];
}
public function supportsNormalization($data, ?string $format = null): bool
public function supportsNormalization($data, ?string $format = null, array $context = []): bool
{
return true;
}

4
src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
View File

@@ -113,11 +113,11 @@ class PersonMove
$conditions = [];
if (array_key_exists('joinTable', $mapping)) {
if (property_exists($mapping, 'joinTable')) {
foreach ($mapping['joinTable']['joinColumns'] as $columns) {
$conditions[] = sprintf('%s = %d', $columns['referencedColumnName'], $from->getId());
}
} elseif (array_key_exists('joinColumns', $mapping)) {
} elseif (property_exists($mapping, 'joinColumns')) {
foreach ($mapping['joinColumns'] as $columns) {
$conditions[] = sprintf('%s = %d', $columns['name'], $from->getId());
}

2
src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php
View File

@@ -79,7 +79,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
* @ParamConverter("acpw2", options={"id": "acpw2_id"})
*/
#[Route(path: '/{_locale}/person/{acpw1_id}/acpw-duplicate/{acpw2_id}/confirm', name: 'chill_person_acpw_duplicate_confirm')]
public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request)
public function confirmAction(AccompanyingPeriodWork $acpw1, AccompanyingPeriodWork $acpw2, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
{
$accompanyingPeriod = $acpw1->getAccompanyingPeriod();

2
src/Bundle/ChillPersonBundle/Controller/PersonEditController.php
View File

@@ -44,7 +44,7 @@ final readonly class PersonEditController
* @ParamConverter("person", options={"id": "person_id"})
*/
#[Route(path: '/{_locale}/person/{person_id}/general/edit', name: 'chill_person_general_edit')]
public function editAction(Person $person, Request $request, Session $session)
public function editAction(Person $person, Request $request, Session $session): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
{
if (!$this->security->isGranted(PersonVoter::UPDATE, $person)) {
throw new AccessDeniedHttpException('You are not allowed to edit this person.');

4
src/Bundle/ChillPersonBundle/Repository/Household/HouseholdRepository.php
View File

@@ -50,7 +50,7 @@ final readonly class HouseholdRepository implements ObjectRepository
$this->em = $entityManager;
}
public function countByAccompanyingPeriodParticipation(Person $person)
public function countByAccompanyingPeriodParticipation(Person $person): mixed
{
return $this->buildQueryByAccompanyingPeriodParticipation($person, true);
}
@@ -70,7 +70,7 @@ final readonly class HouseholdRepository implements ObjectRepository
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
public function findByAccompanyingPeriodParticipation(Person $person, int $limit, int $offset)
public function findByAccompanyingPeriodParticipation(Person $person, int $limit, int $offset): mixed
{
return $this->buildQueryByAccompanyingPeriodParticipation($person, false, $limit, $offset);
}

8
src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/SocialIssueConsistency/AccompanyingPeriodSocialIssueConsistencyEntityListenerTest.php
View File

@@ -44,7 +44,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
$entity = $this->generateClass($period, $socialIssues);
$consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
$consistency->prePersist($entity, $this->generateLifecycleArgs($period, Step::PrePersist));
$consistency->prePersist($entity);
$this->assertCount(2, $period->getSocialIssues());
$this->assertContains($grandGrandChild, $period->getSocialIssues());
@@ -69,7 +69,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
$period->addSocialIssue($issue);
}
$consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs($period, Step::PrePersist));
$consistency->prePersistAccompanyingPeriod($period);
$this->assertCount(1, $period->getSocialIssues());
$this->assertSame($grandGrandChild, $period->getSocialIssues()->first());
@@ -87,7 +87,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
$entity = $this->generateClass($period, $socialIssues);
$consistency = new AccompanyingPeriodSocialIssueConsistencyEntityListener();
$consistency->preUpdate($entity, $this->generateLifecycleArgs($period, Step::PreUpdate));
$consistency->preUpdate($entity);
$this->assertCount(2, $period->getSocialIssues());
$this->assertContains($grandGrandChild, $period->getSocialIssues());
@@ -112,7 +112,7 @@ final class AccompanyingPeriodSocialIssueConsistencyEntityListenerTest extends T
$period->addSocialIssue($issue);
}
$consistency->prePersistAccompanyingPeriod($period, $this->generateLifecycleArgs($period, Step::PrePersist));
$consistency->prePersistAccompanyingPeriod($period);
$this->assertCount(1, $period->getSocialIssues());
$this->assertSame($grandGrandChild, $period->getSocialIssues()->first());

4
src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyDuplicateController.php
View File

@@ -31,7 +31,7 @@ class ThirdpartyDuplicateController extends AbstractController
* @ParamConverter("thirdparty", options={"id": "thirdparty_id"})
*/
#[Route(path: '/{_locale}/3party/{thirdparty_id}/find-manually', name: 'chill_thirdparty_find_duplicate')]
public function findManuallyDuplicateAction(ThirdParty $thirdparty, Request $request)
public function findManuallyDuplicateAction(ThirdParty $thirdparty, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
{
$suggested = [];
@@ -74,7 +74,7 @@ class ThirdpartyDuplicateController extends AbstractController
* @ParamConverter("thirdparty2", options={"id": "thirdparty2_id"})
*/
#[Route(path: '/{_locale}/3party/{thirdparty1_id}/duplicate/{thirdparty2_id}/confirm', name: 'chill_thirdparty_duplicate_confirm')]
public function confirmAction(ThirdParty $thirdparty1, ThirdParty $thirdparty2, Request $request)
public function confirmAction(ThirdParty $thirdparty1, ThirdParty $thirdparty2, Request $request): \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
{
try {
$this->validateThirdpartyMerge($thirdparty1, $thirdparty2);

4
src/Bundle/ChillThirdPartyBundle/Form/ThirdpartyFindDuplicateType.php
View File

@@ -19,7 +19,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
class ThirdpartyFindDuplicateType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('thirdparty', PickThirdpartyDynamicType::class, [
@@ -32,7 +32,7 @@ class ThirdpartyFindDuplicateType extends AbstractType
]);
}
public function configureOptions(OptionsResolver $resolver)
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'suggested' => [],