Ver código fonte

revert some changes from previous commit

Olivier Massot 11 meses atrás
pai
commit
617bc3c718

+ 1 - 1
src/Entity/Booking/CourseRecur.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 class CourseRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'course';
+    protected string $discr = 'course';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private Course $event;

+ 1 - 1
src/Entity/Booking/EducationalProjectRecur.php

@@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 class EducationalProjectRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'educationalproject';
+    protected string $discr = 'educationalproject';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private EducationalProject $event;

+ 1 - 1
src/Entity/Booking/EventRecur.php

@@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 class EventRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'event';
+    protected string $discr = 'event';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private Event $event;

+ 1 - 1
src/Entity/Booking/ExamenRecur.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 class ExamenRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'examen';
+    protected string $discr = 'examen';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private Examen $event;

+ 1 - 1
src/Entity/Booking/OrganizationHoliday.php

@@ -26,7 +26,7 @@ use Doctrine\ORM\Mapping as ORM;
 class OrganizationHoliday extends AbstractBooking
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'organizationholiday';
+    protected string $discr = 'organizationholiday';
 
     #[ORM\OneToMany(mappedBy: 'event', targetEntity: OrganizationHolidayRecur::class, cascade: ['persist'], orphanRemoval: true)]
     private Collection $eventRecur;

+ 1 - 1
src/Entity/Booking/OrganizationHolidayRecur.php

@@ -16,7 +16,7 @@ use Doctrine\ORM\Mapping as ORM;
 class OrganizationHolidayRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'organizationholiday';
+    protected string $discr = 'organizationholiday';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private OrganizationHoliday $event;

+ 1 - 1
src/Entity/Booking/PersonHoliday.php

@@ -26,7 +26,7 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonHoliday extends AbstractBooking
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'personholiday';
+    protected string $discr = 'personholiday';
 
     #[ORM\OneToMany(mappedBy: 'event', targetEntity: PersonHolidayRecur::class, cascade: ['persist'], orphanRemoval: true)]
     protected Collection $eventRecur;

+ 1 - 1
src/Entity/Booking/PersonHolidayRecur.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\Mapping as ORM;
 class PersonHolidayRecur extends AbstractBookingRecur
 {
     #[ORM\Column(length: 255, nullable: false)]
-    private string $discr = 'personholiday';
+    protected string $discr = 'personholiday';
 
     #[ORM\ManyToOne(inversedBy: 'eventRecur')]
     private PersonHoliday $event;

+ 2 - 2
src/Entity/Core/AbstractControl.php

@@ -21,8 +21,8 @@ abstract class AbstractControl
     #[ORM\JoinColumn(nullable: true)]
     protected Access $accompanist;
 
-    #[ORM\ManyToMany(targetEntity: Tagg::class, inversedBy: 'controls', cascade: ['persist'], orphanRemoval: false)]
-    protected Collection $tags;
+//    #[ORM\ManyToMany(targetEntity: Tagg::class, inversedBy: 'controls', cascade: ['persist'], orphanRemoval: false)]
+//    protected Collection $tags;
 
     public function __construct()
     {

+ 1 - 0
src/Entity/Product/EquipmentControl.php

@@ -36,6 +36,7 @@ class EquipmentControl extends AbstractControl
     public function __construct()
     {
         $this->tags = new ArrayCollection();
+        parent::__construct();
     }
 
     public function getDiscr(): ?string