fixup! Gebruik Doctrine DateTimeImmutable

Author: NathanHuisman

lib/Kernel.php

@@ -48,8 +48,7 @@ protected function configureContainer(ContainerConfigurator $container): void
 		}
 	}
 
-	/** @return void */
-	public function boot()
+	public function boot(): void
 	{
 		parent::boot();
 		ContainerFacade::init($this->container);

lib/entity/corvee/CorveeTaak.php

@@ -92,7 +92,7 @@ class CorveeTaak implements Agendeerbaar
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'date')]
+	#[ORM\Column(type: 'date_immutable')]
 	public $datum;
 	/**
 	 * @var integer

lib/entity/eetplan/Eetplan.php

@@ -38,7 +38,7 @@ class Eetplan implements DataTableEntry
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'date', nullable: true)]
+	#[ORM\Column(type: 'date_immutable', nullable: true)]
 	public $avond;
 	/**
 	 * Specifiek bedoelt voor bekende huizen.

lib/entity/groepen/Verticale.php

@@ -23,7 +23,6 @@
 class Verticale extends Groep
 {
 	/**
-<<<<<<< HEAD
 	 * Primary key
 	 * @var string
 	 */
@@ -45,14 +44,6 @@ class Verticale extends Groep
 	#[Serializer\Groups(['datatable', 'log', 'vue'])]
 	#[ORM\Column(type: 'stringkey', unique: true)]
 	public $naam;
-=======
-	* Primary key
-	* @var string
-	*/
-	#[ORM\Column(type: 'string', unique: true, length: 1, options: ['fixed' => true])]
-	#[Serializer\Groups(['datatable', 'log', 'vue'])]
-	public $letter;
->>>>>>> 293c8a774 (Fix meer problemen)
 
 	// Stiekem hebben we helemaal geen leden.
 	public function getLeden()

lib/entity/maalcie/ArchiefMaaltijd.php

@@ -51,12 +51,12 @@ class ArchiefMaaltijd implements Agendeerbaar
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'date')]
+	#[ORM\Column(type: 'date_immutable')]
 	public $datum;
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'time')]
+	#[ORM\Column(type: 'time_immutable')]
 	public $tijd;
 	/**
 	 * @var int

lib/entity/maalcie/Maaltijd.php

@@ -104,12 +104,12 @@ class Maaltijd implements Agendeerbaar, DisplayEntity
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'date')]
+	#[ORM\Column(type: 'date_immutable')]
 	public $datum;
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'time')]
+	#[ORM\Column(type: 'time_immutable')]
 	public $tijd;
 	/**
 	 * @var bool
@@ -416,7 +416,7 @@ public function getUUID(): string
 		return $this->maaltijd_id . '@maaltijd.csrdelft.nl';
 	}
 
-	public function getMoment()
+	public function getMoment(): DateTimeImmutable
 	{
 		return $this->datum->setTime(
 			$this->tijd->format('H'),

lib/entity/maalcie/MaaltijdRepetitie.php

@@ -5,9 +5,9 @@
 use CsrDelft\common\Eisen;
 use CsrDelft\entity\fiscaat\CiviProduct;
 use CsrDelft\view\formulier\DisplayEntity;
+use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Monolog\DateTimeImmutable;
 
 /**
  * MaaltijdRepetitie.class.php  |  P.W.G. Brussee ([email protected])
@@ -74,7 +74,7 @@ class MaaltijdRepetitie implements DisplayEntity
 	/**
 	 * @var DateTimeImmutable
 	 */
-	#[ORM\Column(type: 'time')]
+	#[ORM\Column(type: 'time_immutable')]
 	public $standaard_tijd;
 	/**
 	 * @var int|null

lib/view/toestemming/ToestemmingModalForm.php

@@ -61,11 +61,7 @@ public function __construct(
 			}
 		}
 
-<<<<<<< HEAD
 		$twig = ContainerFacade::getContainer()->get('csr.hack.twig');
-=======
-		$twig = ContainerFacade::getContainer()->get(Environment::class);
->>>>>>> 293c8a774 (Fix meer problemen)
 
 		$this->addFields([
 			new HtmlComment(