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

Merge branch '102_activites_annexes' of gitlab.com:Chill-Projet/chill-bundles into 102_activites_annexes

Browse Source
This commit is contained in:
Julie Lenaerts 2021-08-03 11:22:02 +02:00
commit 3082634323
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
View File

@ -15,7 +15,7 @@ class AsideActivity
* @ORM\GeneratedValue * @ORM\GeneratedValue
* @ORM\Column(type="integer") * @ORM\Column(type="integer")
*/ */
private $id; private ?int $id;
/** /**
* @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities") * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")

8
src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
View File

@ -19,14 +19,14 @@ class AsideActivityCategory
private $id; private $id;
/** /**
* @ORM\Column(type="string", length=255) * @ORM\Column(type="json", length=255)
*/ */
private $title; private array $title;
/** /**
* @ORM\Column(type="boolean") * @ORM\Column(type="boolean")
*/ */
private $isActive; private bool $isActive = true;
public function getId(): ?int public function getId(): ?int
{ {
@ -45,7 +45,7 @@ class AsideActivityCategory
return $this; return $this;
} }
public function getIsActive(): ?bool public function getIsActive(): bool
{ {
return $this->isActive; return $this->isActive;
} }