From db35e380c023cd0148f9bf246bdd851893461177 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Mon, 11 Nov 2024 11:21:28 -0600
Subject: [PATCH] Fix newsletter type hints

---
 lib/NewsletterSubscription.php       | 2 +-
 www/newsletter/subscriptions/new.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/NewsletterSubscription.php b/lib/NewsletterSubscription.php
index 85b5a127..bfeb548a 100644
--- a/lib/NewsletterSubscription.php
+++ b/lib/NewsletterSubscription.php
@@ -14,7 +14,7 @@ class NewsletterSubscription{
 	public ?int $UserId = null;
 	public DateTimeImmutable $Created;
 
-	protected ?User $_User;
+	protected User $_User;
 	protected string $_Url;
 
 
diff --git a/www/newsletter/subscriptions/new.php b/www/newsletter/subscriptions/new.php
index eb7de8ba..ace2ea46 100644
--- a/www/newsletter/subscriptions/new.php
+++ b/www/newsletter/subscriptions/new.php
@@ -3,7 +3,7 @@ use function Safe\session_unset;
 
 session_start();
 
-/** @var NewsletterSubscription $exception */
+/** @var NewsletterSubscription $subscription */
 $subscription = $_SESSION['subscription'] ?? new NewsletterSubscription();
 /** @var ?\Exception $exception */
 $exception = $_SESSION['exception'] ?? null;
@@ -34,7 +34,7 @@ if($exception){
 				<input type="text" name="automationtest" value="" maxlength="80" />
 			</label>
 			<label>Your email address
-				<input type="email" name="email" value="<?= Formatter::EscapeHtml($subscription->User?->Email) ?>" maxlength="80" required="required" />
+				<input type="email" name="email" value="<?= Formatter::EscapeHtml($subscription->User->Email ?? '') ?>" maxlength="80" required="required" />
 			</label>
 			<label class="captcha">
 				Type the letters in the <abbr class="acronym">CAPTCHA</abbr> image