From 05286a96338db08ae41e7192e76b01a19ddc6c78 Mon Sep 17 00:00:00 2001
From: BentiGorlich <benjamin_g@posteo.de>
Date: Mon, 9 Dec 2024 17:28:27 +0100
Subject: [PATCH] Make applicationText nullable (#1276)

---
 src/Entity/User.php                                            | 2 +-
 .../Api/Instance/Admin/InstanceSettingsRetrieveApiTest.php     | 1 +
 .../Api/Instance/Admin/InstanceSettingsUpdateApiTest.php       | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Entity/User.php b/src/Entity/User.php
index 73fb52b8a..3d77c7778 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -243,7 +243,7 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface, Visibil
     public string $type;
 
     #[Column(type: 'text', nullable: true)]
-    public string $applicationText;
+    public ?string $applicationText;
 
     #[Column(type: 'enumApplicationStatus', nullable: false, options: ['default' => EApplicationStatus::Approved->value])]
     private string $applicationStatus;
diff --git a/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsRetrieveApiTest.php b/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsRetrieveApiTest.php
index 8a0dd605b..fac575941 100644
--- a/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsRetrieveApiTest.php
+++ b/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsRetrieveApiTest.php
@@ -36,6 +36,7 @@ class InstanceSettingsRetrieveApiTest extends WebTestCase
         'MBIN_SSO_ONLY_MODE',
         'MBIN_SSO_SHOW_FIRST',
         'MAX_IMAGE_BYTES',
+        'MBIN_NEW_USERS_NEED_APPROVAL',
     ];
 
     public function testApiCannotRetrieveInstanceSettingsAnonymous(): void
diff --git a/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsUpdateApiTest.php b/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsUpdateApiTest.php
index 8335f956c..6322737fe 100644
--- a/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsUpdateApiTest.php
+++ b/tests/Functional/Controller/Api/Instance/Admin/InstanceSettingsUpdateApiTest.php
@@ -38,6 +38,7 @@ class InstanceSettingsUpdateApiTest extends WebTestCase
         'MBIN_SSO_ONLY_MODE',
         'MBIN_SSO_SHOW_FIRST',
         'MAX_IMAGE_BYTES',
+        'MBIN_NEW_USERS_NEED_APPROVAL',
     ];
 
     public function testApiCannotUpdateInstanceSettingsAnonymous(): void
@@ -112,6 +113,7 @@ public function testApiCanUpdateInstanceSettings(): void
             'MBIN_SSO_ONLY_MODE' => false,
             'MBIN_SSO_SHOW_FIRST' => false,
             'MAX_IMAGE_BYTES' => 10000,
+            'MBIN_NEW_USERS_NEED_APPROVAL' => false,
         ];
 
         $this->client->jsonRequest('PUT', '/api/instance/settings', $settings, server: ['HTTP_AUTHORIZATION' => $token]);
@@ -152,6 +154,7 @@ public function testApiCanUpdateInstanceSettings(): void
             'MBIN_SSO_ONLY_MODE' => true,
             'MBIN_SSO_SHOW_FIRST' => true,
             'MAX_IMAGE_BYTES' => 30000,
+            'MBIN_NEW_USERS_NEED_APPROVAL' => false,
         ];
 
         $this->client->jsonRequest('PUT', '/api/instance/settings', $settings, server: ['HTTP_AUTHORIZATION' => $token]);