mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-10-04 12:29:43 +00:00
Rector changes and immplementations of required methods
This commit is contained in:
@@ -26,7 +26,7 @@ class CalculatorManager
|
||||
*/
|
||||
private array $defaultCalculator = [];
|
||||
|
||||
public function addCalculator(CalculatorInterface $calculator, bool $default)
|
||||
public function addCalculator(CalculatorInterface $calculator, bool $default): void
|
||||
{
|
||||
$this->calculators[$calculator->getAlias()] = $calculator;
|
||||
|
||||
|
@@ -16,7 +16,7 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
|
||||
|
||||
class ChillBudgetBundle extends Bundle
|
||||
{
|
||||
public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container)
|
||||
public function build(\Symfony\Component\DependencyInjection\ContainerBuilder $container): void
|
||||
{
|
||||
parent::build($container);
|
||||
|
||||
|
@@ -60,7 +60,7 @@ abstract class AbstractElementController extends AbstractController
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$this->chillMainLogger->notice('A budget element has been removed', [
|
||||
'family_element' => $element::class,
|
||||
'by_user' => $this->getUser()->getUsername(),
|
||||
'by_user' => $this->getUser()->getUserIdentifier(),
|
||||
'family_member_id' => $element->getId(),
|
||||
'amount' => $element->getAmount(),
|
||||
'type' => $element->getType(),
|
||||
|
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\Annotation\Route;
|
||||
class AdminController extends AbstractController
|
||||
{
|
||||
#[Route(path: '/{_locale}/admin/budget', name: 'chill_admin_budget')]
|
||||
public function indexAdminAction()
|
||||
public function indexAdminAction(): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
return $this->render('@ChillBudget/Admin/index.html.twig');
|
||||
}
|
||||
|
@@ -23,7 +23,7 @@ class ChargeController extends AbstractElementController
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
#[\Symfony\Component\Routing\Annotation\Route(path: '{_locale}/budget/charge/{id}/delete', name: 'chill_budget_charge_delete')]
|
||||
public function deleteAction(Request $request, Charge $charge)
|
||||
public function deleteAction(Request $request, Charge $charge): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
return $this->_delete(
|
||||
$charge,
|
||||
@@ -37,7 +37,7 @@ class ChargeController extends AbstractElementController
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
#[\Symfony\Component\Routing\Annotation\Route(path: '{_locale}/budget/charge/{id}/edit', name: 'chill_budget_charge_edit')]
|
||||
public function editAction(Request $request, Charge $charge)
|
||||
public function editAction(Request $request, Charge $charge): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
return $this->_edit(
|
||||
$charge,
|
||||
@@ -84,7 +84,7 @@ class ChargeController extends AbstractElementController
|
||||
return $this->_view($charge, '@ChillBudget/Charge/view.html.twig');
|
||||
}
|
||||
|
||||
protected function createNewElement()
|
||||
protected function createNewElement(): \Chill\BudgetBundle\Entity\Charge
|
||||
{
|
||||
return new Charge();
|
||||
}
|
||||
|
@@ -24,7 +24,7 @@ class ElementController extends AbstractController
|
||||
public function __construct(private readonly CalculatorManager $calculator, private readonly ResourceRepository $resourceRepository, private readonly ChargeRepository $chargeRepository) {}
|
||||
|
||||
#[\Symfony\Component\Routing\Annotation\Route(path: '{_locale}/budget/elements/by-person/{id}', name: 'chill_budget_elements_index')]
|
||||
public function indexAction(Person $person)
|
||||
public function indexAction(Person $person): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
$this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $person);
|
||||
|
||||
@@ -46,7 +46,7 @@ class ElementController extends AbstractController
|
||||
}
|
||||
|
||||
#[\Symfony\Component\Routing\Annotation\Route(path: '{_locale}/budget/elements/by-household/{id}', name: 'chill_budget_elements_household_index')]
|
||||
public function indexHouseholdAction(Household $household)
|
||||
public function indexHouseholdAction(Household $household): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
$this->denyAccessUnlessGranted(BudgetElementVoter::SEE, $household);
|
||||
|
||||
|
@@ -21,7 +21,7 @@ use Symfony\Component\HttpFoundation\Response;
|
||||
class ResourceController extends AbstractElementController
|
||||
{
|
||||
#[\Symfony\Component\Routing\Annotation\Route(path: '{_locale}/budget/resource/{id}/delete', name: 'chill_budget_resource_delete')]
|
||||
public function deleteAction(Request $request, Resource $resource)
|
||||
public function deleteAction(Request $request, Resource $resource): \Symfony\Component\HttpFoundation\Response
|
||||
{
|
||||
return $this->_delete(
|
||||
$resource,
|
||||
@@ -76,7 +76,7 @@ class ResourceController extends AbstractElementController
|
||||
return $this->_view($resource, '@ChillBudget/Resource/view.html.twig');
|
||||
}
|
||||
|
||||
protected function createNewElement()
|
||||
protected function createNewElement(): \Chill\BudgetBundle\Entity\Resource
|
||||
{
|
||||
return new Resource();
|
||||
}
|
||||
|
@@ -29,7 +29,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
|
||||
*/
|
||||
class ChillBudgetExtension extends Extension implements PrependExtensionInterface
|
||||
{
|
||||
public function load(array $configs, ContainerBuilder $container)
|
||||
public function load(array $configs, ContainerBuilder $container): void
|
||||
{
|
||||
$configuration = $this->getConfiguration($configs, $container);
|
||||
$config = $this->processConfiguration($configuration, $configs);
|
||||
@@ -48,7 +48,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
|
||||
$this->storeConfig('charges', $config, $container);
|
||||
}
|
||||
|
||||
public function prepend(ContainerBuilder $container)
|
||||
public function prepend(ContainerBuilder $container): void
|
||||
{
|
||||
$this->prependAuthorization($container);
|
||||
$this->prependRoutes($container);
|
||||
@@ -58,7 +58,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
|
||||
/** (non-PHPdoc).
|
||||
* @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
|
||||
*/
|
||||
public function prependRoutes(ContainerBuilder $container)
|
||||
public function prependRoutes(ContainerBuilder $container): void
|
||||
{
|
||||
// add routes for custom bundle
|
||||
$container->prependExtensionConfig('chill_main', [
|
||||
|
@@ -17,7 +17,7 @@ use Symfony\Component\DependencyInjection\Reference;
|
||||
|
||||
class CalculatorCompilerPass implements CompilerPassInterface
|
||||
{
|
||||
public function process(ContainerBuilder $container)
|
||||
public function process(ContainerBuilder $container): void
|
||||
{
|
||||
$manager = $container->getDefinition(\Chill\BudgetBundle\Calculator\CalculatorManager::class);
|
||||
|
||||
|
@@ -68,7 +68,7 @@ class Charge extends AbstractElement implements HasCentersInterface
|
||||
return $this->charge;
|
||||
}
|
||||
|
||||
public function getHelp()
|
||||
public function getHelp(): ?string
|
||||
{
|
||||
return $this->help;
|
||||
}
|
||||
@@ -78,7 +78,7 @@ class Charge extends AbstractElement implements HasCentersInterface
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getId()
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
@@ -50,7 +50,7 @@ class Resource extends AbstractElement implements HasCentersInterface
|
||||
*
|
||||
* @return int
|
||||
*/
|
||||
public function getId()
|
||||
public function getId(): ?int
|
||||
{
|
||||
return $this->id;
|
||||
}
|
||||
|
@@ -22,7 +22,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
class ChargeKindType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('name', TranslatableStringFormType::class, [
|
||||
@@ -39,7 +39,7 @@ class ChargeKindType extends AbstractType
|
||||
]);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver
|
||||
->setDefault('class', ChargeKind::class);
|
||||
|
@@ -22,7 +22,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
class ResourceKindType extends AbstractType
|
||||
{
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('name', TranslatableStringFormType::class, [
|
||||
@@ -39,7 +39,7 @@ class ResourceKindType extends AbstractType
|
||||
]);
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver
|
||||
->setDefault('class', ResourceKind::class);
|
||||
|
@@ -29,7 +29,7 @@ class ChargeType extends AbstractType
|
||||
{
|
||||
public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ChargeKindRepository $repository, private readonly TranslatorInterface $translator) {}
|
||||
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('charge', EntityType::class, [
|
||||
@@ -74,7 +74,7 @@ class ChargeType extends AbstractType
|
||||
}
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => Charge::class,
|
||||
@@ -89,7 +89,7 @@ class ChargeType extends AbstractType
|
||||
->setAllowedTypes('show_help', 'boolean');
|
||||
}
|
||||
|
||||
public function getBlockPrefix()
|
||||
public function getBlockPrefix(): string
|
||||
{
|
||||
return 'chill_budgetbundle_charge';
|
||||
}
|
||||
|
@@ -28,7 +28,7 @@ class ResourceType extends AbstractType
|
||||
{
|
||||
public function __construct(protected TranslatableStringHelperInterface $translatableStringHelper, private readonly ResourceKindRepository $repository, private readonly TranslatorInterface $translator) {}
|
||||
|
||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||
public function buildForm(FormBuilderInterface $builder, array $options): void
|
||||
{
|
||||
$builder
|
||||
->add('resource', EntityType::class, [
|
||||
@@ -59,7 +59,7 @@ class ResourceType extends AbstractType
|
||||
}
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
public function configureOptions(OptionsResolver $resolver): void
|
||||
{
|
||||
$resolver->setDefaults([
|
||||
'data_class' => Resource::class,
|
||||
@@ -72,7 +72,7 @@ class ResourceType extends AbstractType
|
||||
->setAllowedTypes('show_end_date', 'boolean');
|
||||
}
|
||||
|
||||
public function getBlockPrefix()
|
||||
public function getBlockPrefix(): string
|
||||
{
|
||||
return 'chill_budgetbundle_resource';
|
||||
}
|
||||
|
@@ -19,7 +19,7 @@ final readonly class AdminMenuBuilder implements LocalMenuBuilderInterface
|
||||
{
|
||||
public function __construct(private Security $security) {}
|
||||
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters)
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters): void
|
||||
{
|
||||
// all the entries below must have ROLE_ADMIN permissions
|
||||
if (!$this->security->isGranted('ROLE_ADMIN')) {
|
||||
|
@@ -22,7 +22,7 @@ final readonly class HouseholdMenuBuilder implements LocalMenuBuilderInterface
|
||||
{
|
||||
public function __construct(private Security $security, private TranslatorInterface $translator) {}
|
||||
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters)
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters): void
|
||||
{
|
||||
/** @var Household $household */
|
||||
$household = $parameters['household'];
|
||||
|
@@ -22,7 +22,7 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
|
||||
{
|
||||
public function __construct(protected AuthorizationCheckerInterface $authorizationChecker, protected TranslatorInterface $translator) {}
|
||||
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters)
|
||||
public function buildMenu($menuId, MenuItem $menu, array $parameters): void
|
||||
{
|
||||
/** @var Person $person */
|
||||
$person = $parameters['person'];
|
||||
|
@@ -64,12 +64,12 @@ class BudgetElementVoter extends Voter implements ProvideRoleHierarchyInterface
|
||||
return self::ROLES;
|
||||
}
|
||||
|
||||
protected function supports($attribute, $subject)
|
||||
protected function supports(string $attribute, mixed $subject): bool
|
||||
{
|
||||
return $this->voter->supports($attribute, $subject);
|
||||
}
|
||||
|
||||
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
|
||||
protected function voteOnAttribute(string $attribute, mixed $subject, TokenInterface $token): bool
|
||||
{
|
||||
if (
|
||||
$subject instanceof Person
|
||||
|
@@ -23,7 +23,7 @@ final class ElementControllerTest extends WebTestCase
|
||||
/**
|
||||
* @doesNotPerformAssertions
|
||||
*/
|
||||
public function testIndex()
|
||||
public function testIndex(): void
|
||||
{
|
||||
$client = self::createClient();
|
||||
|
||||
@@ -33,7 +33,7 @@ final class ElementControllerTest extends WebTestCase
|
||||
/**
|
||||
* @doesNotPerformAssertions
|
||||
*/
|
||||
public function testList()
|
||||
public function testList(): void
|
||||
{
|
||||
$client = self::createClient();
|
||||
|
||||
|
@@ -32,7 +32,7 @@ final class Version20221207105407 extends AbstractMigration implements Container
|
||||
return 'Use new budget admin entities';
|
||||
}
|
||||
|
||||
public function setContainer(?ContainerInterface $container = null)
|
||||
public function setContainer(?ContainerInterface $container = null): void
|
||||
{
|
||||
$this->container = $container;
|
||||
}
|
||||
|
Reference in New Issue
Block a user