Upgraded composer packages, fixed class naming and return types

composer.json

@@ -69,5 +69,10 @@
             "Database\\Factories\\Engelsystem\\Models\\": "db/factories/",
             "Engelsystem\\Test\\": "tests/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true
+        }
     }
 }

includes/controller/rooms_controller.php

@@ -13,7 +13,7 @@ use Engelsystem\ShiftsFilterRenderer;
  *
  * @return array
  */
-function room_controller()
+function room_controller(): array
 {
     if (!auth()->can('view_rooms')) {
         throw_redirect(page_link_to());
@@ -62,7 +62,7 @@ function room_controller()
  *
  * @return array
  */
-function rooms_controller()
+function rooms_controller(): array
 {
     $request = request();
     $action = $request->input('action');
@@ -77,6 +77,8 @@ function rooms_controller()
         default:
             throw_redirect(page_link_to('admin_rooms'));
     }
+
+    return ['', ''];
 }
 
 /**

includes/controller/shift_entries_controller.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Collection;
  *
  * @return array
  */
-function shift_entries_controller()
+function shift_entries_controller(): array
 {
     $user = auth()->user();
     if (!$user) {
@@ -28,6 +28,8 @@ function shift_entries_controller()
         case 'delete':
             return shift_entry_delete_controller();
     }
+
+    return ['', ''];
 }
 
 /**
@@ -35,7 +37,7 @@ function shift_entries_controller()
  *
  * @return array
  */
-function shift_entry_create_controller()
+function shift_entry_create_controller(): array
 {
     $user = auth()->user();
     $request = request();
@@ -74,7 +76,7 @@ function shift_entry_create_controller()
  * @param array $angeltype
  * @return array
  */
-function shift_entry_create_controller_admin($shift, $angeltype)
+function shift_entry_create_controller_admin($shift, $angeltype): array
 {
     $signup_user = auth()->user();
     $request = request();
@@ -138,7 +140,7 @@ function shift_entry_create_controller_admin($shift, $angeltype)
  * @param array $angeltype
  * @return array
  */
-function shift_entry_create_controller_supporter($shift, $angeltype)
+function shift_entry_create_controller_supporter($shift, $angeltype): array
 {
     $request = request();
     $signup_user = auth()->user();
@@ -210,7 +212,7 @@ function shift_entry_error_message(ShiftSignupState $shift_signup_state)
  * @param array $angeltype
  * @return array
  */
-function shift_entry_create_controller_user($shift, $angeltype)
+function shift_entry_create_controller_user($shift, $angeltype): array
 {
     $request = request();
 

includes/controller/user_angeltypes_controller.php

@@ -39,7 +39,7 @@ function user_angeltypes_unconfirmed_hint()
  *
  * @return array
  */
-function user_angeltypes_delete_all_controller()
+function user_angeltypes_delete_all_controller(): array
 {
     $request = request();
 
@@ -78,7 +78,7 @@ function user_angeltypes_delete_all_controller()
  *
  * @return array
  */
-function user_angeltypes_confirm_all_controller()
+function user_angeltypes_confirm_all_controller(): array
 {
     $user = auth()->user();
     $request = request();
@@ -118,7 +118,7 @@ function user_angeltypes_confirm_all_controller()
  *
  * @return array
  */
-function user_angeltype_confirm_controller()
+function user_angeltype_confirm_controller(): array
 {
     $user = auth()->user();
     $request = request();
@@ -178,7 +178,7 @@ function user_angeltype_confirm_controller()
  *
  * @return array
  */
-function user_angeltype_delete_controller()
+function user_angeltype_delete_controller(): array
 {
     $request = request();
     $user = auth()->user();
@@ -231,7 +231,7 @@ function user_angeltype_delete_controller()
  *
  * @return array
  */
-function user_angeltype_update_controller()
+function user_angeltype_update_controller(): array
 {
     $supporter = false;
     $request = request();
@@ -302,7 +302,7 @@ function user_angeltype_update_controller()
  *
  * @return array
  */
-function user_angeltype_add_controller()
+function user_angeltype_add_controller(): array
 {
     $angeltype = load_angeltype();
 
@@ -403,7 +403,7 @@ function user_angeltype_join_controller($angeltype)
  *
  * @return array
  */
-function user_angeltypes_controller()
+function user_angeltypes_controller(): array
 {
     $request = request();
     if (!$request->has('action')) {
@@ -426,4 +426,6 @@ function user_angeltypes_controller()
         default:
             throw_redirect(page_link_to('angeltypes'));
     }
+
+    return ['', ''];
 }

includes/controller/users_controller.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\State;
 use Engelsystem\Models\User\User;
 use Engelsystem\ShiftCalendarRenderer;

includes/model/AngelType_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\ValidationResult;
 
 /**

includes/model/NeededAngelTypes_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * Entity needed angeltypes describes how many angels of given type are needed for a shift or in a room.

includes/model/ShiftEntry_model.php

@@ -1,7 +1,7 @@
 <?php
 
 use Carbon\Carbon;
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\Room;
 use Engelsystem\Models\User\User;
 

includes/model/ShiftTypes_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * Delete a shift type.

includes/model/Shifts_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\Room;
 use Engelsystem\Models\User\User;
 use Engelsystem\ShiftsFilter;

includes/model/UserAngelTypes_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\User;
 
 /**

includes/model/UserDriverLicenses_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * Returns a new empty UserDriverLicense

includes/model/UserGroups_model.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * Returns users groups

includes/model/User_model.php

@@ -1,7 +1,7 @@
 <?php
 
 use Carbon\Carbon;
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\User;
 use Engelsystem\Models\Worklog;
 use Engelsystem\ValidationResult;

includes/pages/admin_free.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\User;
 use Illuminate\Database\Query\JoinClause;
 

includes/pages/admin_groups.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * @return string

includes/pages/admin_shifts.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\Room;
 
 /**

includes/pages/admin_user.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\User;
 
 /**

includes/pages/guest_login.php

@@ -1,7 +1,7 @@
 <?php
 
 use Carbon\Carbon;
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Events\Listener\OAuth2;
 use Engelsystem\Models\OAuth;
 use Engelsystem\Models\User\Contact;

includes/pages/user_myshifts.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\User\User;
 
 /**

includes/pages/user_shifts.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 use Engelsystem\Models\Room;
 use Engelsystem\ShiftsFilter;
 use Illuminate\Support\Collection;

includes/sys_auth.php

@@ -1,6 +1,6 @@
 <?php
 
-use Engelsystem\Database\DB;
+use Engelsystem\Database\Db;
 
 /**
  * @param int $user_id