Merge branch 'master' into upgrade-sf5

This commit is contained in:
2024-02-12 21:50:34 +01:00
920 changed files with 6430 additions and 1914 deletions

View File

@@ -440,7 +440,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
return $this->getIsNoAddress();
}
public function setAddressReference(AddressReference $addressReference = null): Address
public function setAddressReference(?AddressReference $addressReference = null): Address
{
$this->addressReference = $addressReference;
@@ -529,7 +529,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
*
* @return Address
*/
public function setPostcode(PostalCode $postcode = null)
public function setPostcode(?PostalCode $postcode = null)
{
$this->postcode = $postcode;
@@ -620,7 +620,7 @@ class Address implements TrackCreationInterface, TrackUpdateInterface
return $this;
}
public function setValidTo(\DateTimeInterface $validTo = null): self
public function setValidTo(?\DateTimeInterface $validTo = null): self
{
$this->validTo = $validTo;

View File

@@ -219,7 +219,7 @@ class AddressReference
*
* @return Address
*/
public function setPostcode(PostalCode $postcode = null)
public function setPostcode(?PostalCode $postcode = null)
{
$this->postcode = $postcode;

View File

@@ -53,5 +53,6 @@ class SimpleGeographicalUnitDTO
* @Serializer\Groups({"read"})
*/
public int $layerId
) {}
) {
}
}

View File

@@ -59,7 +59,7 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
*
* @groups({"read"})
*/
private ?\Chill\MainBundle\Doctrine\Model\Point $center = null;
private ?Point $center = null;
/**
* @ORM\Column(type="string", length=100)
@@ -73,7 +73,7 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
*
* @groups({"write", "read"})
*/
private ?\Chill\MainBundle\Entity\Country $country = null;
private ?Country $country = null;
/**
* @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
@@ -210,7 +210,7 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
*
* @return PostalCode
*/
public function setCountry(Country $country = null)
public function setCountry(?Country $country = null)
{
$this->country = $country;

View File

@@ -78,14 +78,14 @@ class RoleScope
return $this->scope;
}
public function setRole(string $role = null): self
public function setRole(?string $role = null): self
{
$this->role = $role;
return $this;
}
public function setScope(Scope $scope = null): self
public function setScope(?Scope $scope = null): self
{
$this->scope = $scope;

View File

@@ -198,7 +198,9 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
return $this;
}
public function eraseCredentials() {}
public function eraseCredentials()
{
}
public function getAbsenceStart(): ?\DateTimeImmutable
{
@@ -273,7 +275,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
return $this->mainLocation;
}
public function getMainScope(\DateTimeImmutable $at = null): ?Scope
public function getMainScope(?\DateTimeImmutable $at = null): ?Scope
{
$at ??= new \DateTimeImmutable('now');
@@ -322,7 +324,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
return $this->salt;
}
public function getUserJob(\DateTimeImmutable $at = null): ?UserJob
public function getUserJob(?\DateTimeImmutable $at = null): ?UserJob
{
$at ??= new \DateTimeImmutable('now');