Merge remote-tracking branch 'origin/master' into features/household-editor

This commit is contained in:
2021-06-10 11:01:59 +02:00
7 changed files with 143 additions and 144 deletions

View File

@@ -21,38 +21,38 @@ class Position
* @ORM\Column(type="integer")
* @Serializer\Groups({ "read" })
*/
private $id;
private ?int $id;
/**
* @ORM\Column(type="json")
* @Serializer\Groups({ "read" })
*/
private $label = [];
private array $label = [];
/**
* @ORM\Column(type="boolean")
* @Serializer\Groups({ "read" })
*/
private $shareHouseHold;
private bool $shareHouseHold = true;
/**
* @ORM\Column(type="boolean")
* @Serializer\Groups({ "read" })
*/
private $allowHolder;
private bool $allowHolder = false;
/**
* @ORM\Column(type="float")
* @Serializer\Groups({ "read" })
*/
private $ordering;
private float $ordering = 0.00;
public function getId(): ?int
{
return $this->id;
}
public function getLabel(): ?array
public function getLabel(): array
{
return $this->label;
}
@@ -64,7 +64,7 @@ class Position
return $this;
}
public function getShareHousehold(): ?bool
public function getShareHousehold(): bool
{
return $this->shareHouseHold;
}
@@ -76,12 +76,12 @@ class Position
return $this;
}
public function getAllowHolder(): ?bool
public function getAllowHolder(): bool
{
return $this->allowHolder;
}
public function isAllowHolder(): ?bool
public function isAllowHolder(): bool
{
return $this->getAllowHolder();
}
@@ -93,7 +93,7 @@ class Position
return $this;
}
public function getOrdering(): ?float
public function getOrdering(): float
{
return $this->ordering;
}