merge ticket-app-master and fix rector / cs

This commit is contained in:
Julien Fastré 2024-05-28 15:54:52 +02:00
parent aae50ca290
commit 640fd71402
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
4 changed files with 6 additions and 8 deletions

View File

@ -38,11 +38,11 @@ class UserGroup
#[ORM\JoinTable(name: 'chill_main_user_group_user')] #[ORM\JoinTable(name: 'chill_main_user_group_user')]
private Collection $users; private Collection $users;
#[ORM\Column(type: 'text', nullable: false, options: ['default' => '#ffffffff'])] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '#ffffffff'])]
#[Serializer\Groups(['read'])] #[Serializer\Groups(['read'])]
private string $backgroundColor = '#ffffffff'; private string $backgroundColor = '#ffffffff';
#[ORM\Column(type: 'text', nullable: false, options: ['default' => '#000000ff'])] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '#000000ff'])]
#[Serializer\Groups(['read'])] #[Serializer\Groups(['read'])]
private string $foregroundColor = '#000000ff'; private string $foregroundColor = '#000000ff';
@ -52,7 +52,7 @@ class UserGroup
* *
* An empty string means "no exclusion" * An empty string means "no exclusion"
*/ */
#[ORM\Column(type: 'text', nullable: false, options: ['default' => ''])] #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
#[Serializer\Groups(['read'])] #[Serializer\Groups(['read'])]
private string $excludeKey = ''; private string $excludeKey = '';

View File

@ -32,8 +32,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
private TranslatableStringHelperInterface $translatableStringHelper, private TranslatableStringHelperInterface $translatableStringHelper,
private RollingDateConverterInterface $rollingDateConverter private RollingDateConverterInterface $rollingDateConverter
) { ) {}
}
public function addRole(): ?string public function addRole(): ?string
{ {

View File

@ -38,8 +38,7 @@ class GeographicalUnitStatFilter implements FilterInterface
private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly TranslatableStringHelperInterface $translatableStringHelper,
private readonly RollingDateConverterInterface $rollingDateConverter private readonly RollingDateConverterInterface $rollingDateConverter
) { ) {}
}
public function addRole(): ?string public function addRole(): ?string
{ {

View File

@ -101,7 +101,7 @@ class PersonRepository implements ObjectRepository
* Find a person which is associated to the given phonenumber, without restrictions * Find a person which is associated to the given phonenumber, without restrictions
* on any. * on any.
* *
* @return list<Person * @return list<Person>
*/ */
public function findByPhoneNumber(PhoneNumber $phoneNumber, int $firstResult = 0, int $maxResults = 50): array public function findByPhoneNumber(PhoneNumber $phoneNumber, int $firstResult = 0, int $maxResults = 50): array
{ {