Set native property types

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

.phpcs.xml

@@ -8,6 +8,7 @@
     <file>public/index.php</file>
     <file>src</file>
     <file>tests</file>
+    <exclude-pattern>/config/config.php</exclude-pattern>
 
     <rule ref="PSR12" />
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">
@@ -31,5 +32,9 @@
         <exclude-pattern>/includes</exclude-pattern>
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
     </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+        <exclude-pattern>/includes</exclude-pattern>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
+    </rule>
     <rule ref="SlevomatCodingStandard.Commenting.EmptyComment" />
 </ruleset>

db/factories/AngelTypeFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class AngelTypeFactory extends Factory
 {
     /** @var string */
-    protected $model = AngelType::class;
+    protected $model = AngelType::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/FaqFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class FaqFactory extends Factory
 {
     /** @var string */
-    protected $model = Faq::class;
+    protected $model = Faq::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/GroupFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class GroupFactory extends Factory
 {
     /** @var string */
-    protected $model = Group::class;
+    protected $model = Group::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/MessageFactory.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class MessageFactory extends Factory
 {
     /** @var string */
-    protected $model = Message::class;
+    protected $model = Message::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/NewsCommentFactory.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class NewsCommentFactory extends Factory
 {
     /** @var string */
-    protected $model = NewsComment::class;
+    protected $model = NewsComment::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/NewsFactory.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class NewsFactory extends Factory
 {
     /** @var string */
-    protected $model = News::class;
+    protected $model = News::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/PrivilegeFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class PrivilegeFactory extends Factory
 {
     /** @var string */
-    protected $model = Privilege::class;
+    protected $model = Privilege::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/QuestionFactory.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class QuestionFactory extends Factory
 {
     /** @var string */
-    protected $model = Question::class;
+    protected $model = Question::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/RoomFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class RoomFactory extends Factory
 {
     /** @var string */
-    protected $model = Room::class;
+    protected $model = Room::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/Shifts/ScheduleFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class ScheduleFactory extends Factory
 {
     /** @var string */
-    protected $model = Schedule::class;
+    protected $model = Schedule::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/Shifts/ShiftTypeFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class ShiftTypeFactory extends Factory
 {
     /** @var string */
-    protected $model = ShiftType::class;
+    protected $model = ShiftType::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/ContactFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class ContactFactory extends Factory
 {
     /** @var string */
-    protected $model = Contact::class;
+    protected $model = Contact::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/LicenseFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class LicenseFactory extends Factory
 {
     /** @var string */
-    protected $model = License::class;
+    protected $model = License::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/PasswordResetFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class PasswordResetFactory extends Factory
 {
     /** @var string */
-    protected $model = PasswordReset::class;
+    protected $model = PasswordReset::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/PersonalDataFactory.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class PersonalDataFactory extends Factory
 {
     /** @var string */
-    protected $model = PersonalData::class;
+    protected $model = PersonalData::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/SettingsFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class SettingsFactory extends Factory
 {
     /** @var string */
-    protected $model = Settings::class;
+    protected $model = Settings::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/StateFactory.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class StateFactory extends Factory
 {
     /** @var string */
-    protected $model = State::class;
+    protected $model = State::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/User/UserFactory.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class UserFactory extends Factory
 {
     /** @var string */
-    protected $model = User::class;
+    protected $model = User::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/UserAngelTypeFactory.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class UserAngelTypeFactory extends Factory
 {
     /** @var string */
-    protected $model = UserAngelType::class;
+    protected $model = UserAngelType::class; // phpcs:ignore
 
     /**
      * @return array

db/factories/WorklogFactory.php

@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
 class WorklogFactory extends Factory
 {
     /** @var string */
-    protected $model = Worklog::class;
+    protected $model = Worklog::class; // phpcs:ignore
 
     /**
      * @return array

db/migrations/2018_01_01_000001_import_install_sql.php

@@ -6,7 +6,8 @@ use Engelsystem\Database\Migration\Migration;
 
 class ImportInstallSql extends Migration
 {
-    protected $oldTables = [
+    /** @var array<string> */
+    protected array $oldTables = [
         'AngelTypes',
         'EventConfig',
         'GroupPrivileges',

db/migrations/2018_01_01_000005_add_angel_supporter_permissions.php

@@ -7,7 +7,7 @@ use Engelsystem\Database\Migration\Migration;
 class AddAngelSupporterPermissions extends Migration
 {
     /** @var string[] */
-    protected $data = [
+    protected array $data = [
         '2-Engel',
         'shiftentry_edit_angeltype_supporter',
     ];

db/migrations/2018_12_21_000000_change_users_contact_dect_field_size.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Schema\Blueprint;
 class ChangeUsersContactDectFieldSize extends Migration
 {
     /** @var array */
-    protected $tables = [
+    protected array $tables = [
         'AngelTypes'    => 'contact_dect',
         'users_contact' => 'dect',
     ];

db/migrations/2021_05_23_000000_set_admin_password.php

@@ -11,10 +11,8 @@ class SetAdminPassword extends Migration
 {
     use Reference;
 
-    /** @var Authenticator */
     protected Authenticator $auth;
 
-    /** @var Config */
     protected Config $config;
 
     public function __construct(SchemaBuilder $schemaBuilder, Authenticator $auth, Config $config)

includes/pages/schedule/ImportSchedule.php

@@ -39,8 +39,7 @@ class ImportSchedule extends BaseController
     /** @var LoggerInterface */
     protected $log;
 
-    /** @var array */
+    protected array $permissions = [
-    protected $permissions = [
         'schedule.import',
     ];
 

src/Application.php

@@ -12,21 +12,19 @@ use Psr\Http\Server\MiddlewareInterface;
 
 class Application extends Container
 {
-    /** @var string|null */
+    protected ?string $appPath = null;
-    protected $appPath = null;
 
-    /** @var bool */
+    protected bool $isBootstrapped = false;
-    protected $isBootstrapped = false;
 
     /** @var MiddlewareInterface[]|string[] */
-    protected $middleware;
+    protected array $middleware;
 
     /**
      * Registered service providers
      *
      * @var array
      */
-    protected $serviceProviders = [];
+    protected array $serviceProviders = [];
 
     /**
      * Application constructor.

src/Config/Config.php

@@ -11,7 +11,7 @@ class Config extends Fluent
      *
      * @var array
      */
-    protected $attributes = [];
+    protected $attributes = []; // phpcs:ignore
 
     /**
      * @param string|array $key

src/Config/ConfigServiceProvider.php

@@ -11,16 +11,11 @@ use Illuminate\Database\QueryException;
 class ConfigServiceProvider extends ServiceProvider
 {
     /** @var array */
-    protected $configFiles = ['app.php', 'config.default.php', 'config.php'];
+    protected array $configFiles = ['app.php', 'config.default.php', 'config.php'];
 
-    /** @var EventConfig */
+    public function __construct(Application $app, protected ?EventConfig $eventConfig = null)
-    protected $eventConfig;
-
-    public function __construct(Application $app, EventConfig $eventConfig = null)
     {
         parent::__construct($app);
-
-        $this->eventConfig = $eventConfig;
     }
 
     public function register(): void

src/Container/ServiceProvider.php

@@ -6,8 +6,7 @@ use Engelsystem\Application;
 
 abstract class ServiceProvider
 {
-    /** @var Application */
+    protected Application $app;
-    protected $app;
 
     /**
      * ServiceProvider constructor.

src/Controllers/Admin/FaqController.php

@@ -14,20 +14,16 @@ class FaqController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Faq */
+    protected Faq $faq;
-    protected $faq;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'faq.view',
         'faq.edit',
     ];

src/Controllers/Admin/LogsController.php

@@ -9,14 +9,12 @@ use Engelsystem\Models\LogEntry;
 
 class LogsController extends BaseController
 {
-    /** @var LogEntry */
+    protected LogEntry $log;
-    protected $log;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'admin_log',
     ];
 

src/Controllers/Admin/NewsController.php

@@ -15,23 +15,18 @@ class NewsController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var News */
+    protected News $news;
-    protected $news;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'admin_news',
     ];
 

src/Controllers/Admin/QuestionsController.php

@@ -16,23 +16,18 @@ class QuestionsController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Question */
+    protected Question $question;
-    protected $question;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'question.add',
         'question.edit',
     ];

src/Controllers/Admin/UserShirtController.php

@@ -16,26 +16,20 @@ class UserShirtController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var User */
+    protected User $user;
-    protected $user;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'editShirt' => 'user.edit.shirt',
         'saveShirt' => 'user.edit.shirt',
     ];

src/Controllers/Admin/UserWorkLogController.php

@@ -19,29 +19,22 @@ class UserWorkLogController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Worklog */
+    protected Worklog $worklog;
-    protected $worklog;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var User */
+    protected User $user;
-    protected $user;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'admin_user_worklog',
     ];
 

src/Controllers/ApiController.php

@@ -6,8 +6,7 @@ use Engelsystem\Http\Response;
 
 class ApiController extends BaseController
 {
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     public function __construct(Response $response)
     {

src/Controllers/AuthController.php

@@ -15,23 +15,18 @@ class AuthController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var SessionInterface */
+    protected SessionInterface $session;
-    protected $session;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'login'     => 'login',
         'postLogin' => 'login',
     ];

src/Controllers/BaseController.php

@@ -9,7 +9,7 @@ abstract class BaseController
     use ValidatesRequest;
 
     /** @var string[]|string[][] A list of Permissions required to access the controller or certain pages */
-    protected $permissions = [];
+    protected array $permissions = [];
 
     /**
      * Returns the list of permissions

src/Controllers/CreditsController.php

@@ -8,14 +8,11 @@ use Engelsystem\Http\Response;
 
 class CreditsController extends BaseController
 {
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var Version */
+    protected Version $version;
-    protected $version;
 
     public function __construct(Response $response, Config $config, Version $version)
     {

src/Controllers/DesignController.php

@@ -11,11 +11,9 @@ use Engelsystem\Models\User\User;
 
 class DesignController extends BaseController
 {
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
     public function __construct(Response $response, Config $config)
     {

src/Controllers/FaqController.php

@@ -10,17 +10,14 @@ class FaqController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var Faq */
+    protected Faq $faq;
-    protected $faq;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var string[] */
-    protected $permissions = [
+    protected array $permissions = [
         'faq.view',
     ];
 

src/Controllers/HealthController.php

@@ -6,8 +6,7 @@ use Engelsystem\Http\Response;
 
 class HealthController extends BaseController
 {
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     public function __construct(Response $response)
     {

src/Controllers/HomeController.php

@@ -9,14 +9,11 @@ use Engelsystem\Http\Response;
 
 class HomeController extends BaseController
 {
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
     public function __construct(Authenticator $auth, Config $config, Redirector $redirect)
     {

src/Controllers/MessagesController.php

@@ -12,32 +12,26 @@ use Engelsystem\Models\User\User;
 use Illuminate\Database\Query\Expression as QueryExpression;
 use Illuminate\Support\Collection;
 use Engelsystem\Http\Exceptions\HttpForbidden;
+use Psr\Http\Message\RequestInterface;
 
 class MessagesController extends BaseController
 {
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var Response */
+    protected RequestInterface $request;
-    protected $request;
 
-    /** @var Database */
+    protected Database $db;
-    protected $db;
 
-    /** @var Message */
+    protected Message $message;
-    protected $message;
 
-    /** @var User */
+    protected User $user;
-    protected $user;
 
     /** @var string[] */
-    protected $permissions = [
+    protected array $permissions = [
         'user_messages',
     ];
 

src/Controllers/Metrics/Controller.php

@@ -13,23 +13,17 @@ use Psr\Log\LogLevel;
 
 class Controller extends BaseController
 {
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var MetricsEngine */
+    protected MetricsEngine $engine;
-    protected $engine;
 
-    /** @var Request */
+    protected Request $request;
-    protected $request;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var Stats */
+    protected Stats $stats;
-    protected $stats;
 
-    /** @var Version */
+    protected Version $version;
-    protected $version;
 
     public function __construct(
         Response $response,

src/Controllers/Metrics/MetricsEngine.php

@@ -6,8 +6,7 @@ use Engelsystem\Renderer\EngineInterface;
 
 class MetricsEngine implements EngineInterface
 {
-    /** @var string */
+    protected string $prefix = 'engelsystem_';
-    protected $prefix = 'engelsystem_';
 
     /**
      * Render metrics

src/Controllers/Metrics/Stats.php

@@ -30,8 +30,7 @@ use Illuminate\Support\Collection;
 
 class Stats
 {
-    /** @var Database */
+    protected Database $db;
-    protected $db;
 
     public function __construct(Database $db)
     {

src/Controllers/NewsController.php

@@ -16,32 +16,24 @@ class NewsController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var NewsComment */
+    protected NewsComment $comment;
-    protected $comment;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var News */
+    protected News $news;
-    protected $news;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var Request */
+    protected Request $request;
-    protected $request;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'news',
         'meetings'      => 'user_meetings',
         'comment'       => 'news_comments',

src/Controllers/OAuthController.php

@@ -25,29 +25,21 @@ class OAuthController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var AuthController */
+    protected AuthController $authController;
-    protected $authController;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var OAuth */
+    protected OAuth $oauth;
-    protected $oauth;
 
-    /** @var Redirector */
+    protected Redirector $redirector;
-    protected $redirector;
 
-    /** @var Session */
+    protected Session $session;
-    protected $session;
 
-    /** @var UrlGenerator */
+    protected UrlGenerator $url;
-    protected $url;
 
     public function __construct(
         Authenticator $auth,

src/Controllers/PasswordResetController.php

@@ -15,20 +15,16 @@ class PasswordResetController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var EngelsystemMailer */
+    protected EngelsystemMailer $mail;
-    protected $mail;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var SessionInterface */
+    protected SessionInterface $session;
-    protected $session;
 
     /** @var array */
-    protected $permissions = [
+    protected array $permissions = [
         'reset'             => 'login',
         'postReset'         => 'login',
         'resetPassword'     => 'login',

src/Controllers/QuestionsController.php

@@ -14,23 +14,18 @@ class QuestionsController extends BaseController
 {
     use HasUserNotifications;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Question */
+    protected Question $question;
-    protected $question;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var string[] */
-    protected $permissions = [
+    protected array $permissions = [
         'question.add',
     ];
 

src/Controllers/SettingsController.php

@@ -15,23 +15,18 @@ class SettingsController extends BaseController
     use HasUserNotifications;
     use ChecksArrivalsAndDepartures;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var Redirector */
+    protected Redirector $redirect;
-    protected $redirect;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
     /** @var string[] */
-    protected $permissions = [
+    protected array $permissions = [
         'user_settings',
     ];
 

src/Database/Database.php

@@ -7,8 +7,7 @@ use PDO;
 
 class Database
 {
-    /** @var DatabaseConnection */
+    protected DatabaseConnection $connection;
-    protected $connection;
 
     public function __construct(DatabaseConnection $connection)
     {

src/Database/Db.php

@@ -9,8 +9,7 @@ use PDO;
 /** @deprecated */
 class Db
 {
-    /** @var CapsuleManager */
+    protected static CapsuleManager $dbManager;
-    protected static $dbManager;
 
     /**
      * Set the database connection manager

src/Database/Migration/Migrate.php

@@ -19,17 +19,14 @@ class Migrate
     /** @var string */
     public const DOWN = 'down';
 
-    /** @var Application */
+    protected Application $app;
-    protected $app;
 
-    /** @var SchemaBuilder */
+    protected SchemaBuilder $schema;
-    protected $schema;
 
     /** @var callable */
     protected $output;
 
-    /** @var string */
+    protected string $table = 'migrations';
-    protected $table = 'migrations';
 
     /**
      * Migrate constructor

src/Database/Migration/Migration.php

@@ -6,8 +6,7 @@ use Illuminate\Database\Schema\Builder as SchemaBuilder;
 
 abstract class Migration
 {
-    /** @var SchemaBuilder */
+    protected SchemaBuilder $schema;
-    protected $schema;
 
     /**
      * Migration constructor.

src/Events/EventDispatcher.php

@@ -8,7 +8,7 @@ use Illuminate\Support\Str;
 class EventDispatcher
 {
     /** @var callable[] */
-    protected $listeners;
+    protected array $listeners;
 
     public function listen(array|string $events, callable|string $listener): void
     {

src/Events/Listener/News.php

@@ -12,14 +12,11 @@ use Symfony\Component\Mailer\Exception\TransportException;
 
 class News
 {
-    /** @var LoggerInterface */
+    protected LoggerInterface $log;
-    protected $log;
 
-    /** @var EngelsystemMailer */
+    protected EngelsystemMailer $mailer;
-    protected $mailer;
 
-    /** @var UserSettings */
+    protected UserSettings $settings;
-    protected $settings;
 
     public function __construct(
         LoggerInterface $log,

src/Events/Listener/OAuth2.php

@@ -12,13 +12,11 @@ use Psr\Log\LoggerInterface;
 
 class OAuth2
 {
-    /** @var Authenticator */
     protected Authenticator $auth;
 
     /** @var array */
     protected array $config;
 
-    /** @var LoggerInterface */
     protected LoggerInterface $log;
 
     public function __construct(Config $config, LoggerInterface $log, Authenticator $auth)

src/Exceptions/Handler.php

@@ -10,14 +10,12 @@ use Throwable;
 
 class Handler
 {
-    /** @var string */
+    protected string $environment;
-    protected $environment;
 
     /** @var HandlerInterface[] */
-    protected $handler = [];
+    protected array $handler = [];
 
-    /** @var Request */
+    protected ?Request $request = null;
-    protected $request;
 
     /** @var string */
     public const ENV_PRODUCTION = 'prod';

src/Exceptions/Handlers/Legacy.php

@@ -8,8 +8,7 @@ use Throwable;
 
 class Legacy implements HandlerInterface
 {
-    /** @var LoggerInterface */
+    protected ?LoggerInterface $log = null;
-    protected $log;
 
     public function render(Request $request, Throwable $e): void
     {

src/Exceptions/Handlers/Whoops.php

@@ -13,8 +13,7 @@ use Whoops\Run as WhoopsRunner;
 
 class Whoops extends Legacy implements HandlerInterface
 {
-    /** @var Application */
+    protected Application $app;
-    protected $app;
 
     /**
      * Whoops constructor.

src/Helpers/Assets.php

@@ -4,10 +4,8 @@ namespace Engelsystem\Helpers;
 
 class Assets
 {
-    /** @var string */
     protected string $assetsPath;
 
-    /** @var string */
     protected string $manifestFile = 'manifest.json';
 
     /**

src/Helpers/Authenticator.php

@@ -11,28 +11,21 @@ use Symfony\Component\HttpFoundation\Session\Session;
 
 class Authenticator
 {
-    /** @var User|null */
     protected ?User $user = null;
 
-    /** @var ServerRequestInterface */
     protected ServerRequestInterface $request;
 
-    /** @var Session */
     protected Session $session;
 
-    /** @var UserRepository */
     protected UserRepository $userRepository;
 
     /** @var string[] */
     protected array $permissions = [];
 
-    /** @var int|string|null */
+    protected int|string|null $passwordAlgorithm = PASSWORD_DEFAULT;
-    protected $passwordAlgorithm = PASSWORD_DEFAULT;
 
-    /** @var int */
     protected int $defaultRole = 20;
 
-    /** @var int */
     protected int $guestRole = 10;
 
     public function __construct(ServerRequestInterface $request, Session $session, UserRepository $userRepository)

src/Helpers/Schedule/Conference.php

@@ -9,25 +9,20 @@ class Conference
     use CalculatesTime;
 
     /** @var string required */
-    protected $title;
+    protected string $title;
 
     /** @var string required */
-    protected $acronym;
+    protected string $acronym;
 
-    /** @var string|null */
+    protected ?string $start = null;
-    protected $start;
 
-    /** @var string|null */
+    protected ?string $end = null;
-    protected $end;
 
-    /** @var int|null */
+    protected ?int $days = null;
-    protected $days;
 
-    /** @var string|null */
+    protected ?string $timeslotDuration = null;
-    protected $timeslotDuration;
 
-    /** @var string|null */
+    protected ?string $baseUrl = null;
-    protected $baseUrl;
 
     /**
      * Event constructor.

src/Helpers/Schedule/Day.php

@@ -9,19 +9,19 @@ use Carbon\Carbon;
 class Day
 {
     /** @var string required */
-    protected $date;
+    protected string $date;
 
     /** @var Carbon required */
-    protected $start;
+    protected Carbon $start;
 
     /** @var Carbon required */
-    protected $end;
+    protected Carbon $end;
 
     /** @var int required */
-    protected $index;
+    protected int $index;
 
     /** @var Room[] */
-    protected $room;
+    protected array $room;
 
     /**
      * Day constructor.

src/Helpers/Schedule/Event.php

@@ -11,70 +11,66 @@ class Event
     use CalculatesTime;
 
     /** @var string required globally unique */
-    protected $guid;
+    protected string $guid;
 
     /** @var int required globally unique */
-    protected $id;
+    protected int $id;
 
     /** @var Room required, string in XML */
-    protected $room;
+    protected Room $room;
 
     /** @var string required */
-    protected $title;
+    protected string $title;
 
     /** @var string required */
-    protected $subtitle;
+    protected string $subtitle;
 
     /** @var string required */
-    protected $type;
+    protected string $type;
 
     /** @var Carbon required */
-    protected $date;
+    protected Carbon $date;
 
     /** @var string required time (hh:mm:ss || hh:mm) */
-    protected $start;
+    protected string $start;
 
     /** @var string required (h?h:mm:ss || h?h:mm) */
-    protected $duration;
+    protected string $duration;
 
     /** @var string required */
-    protected $abstract;
+    protected string $abstract;
 
     /** @var string required globally unique */
-    protected $slug;
+    protected string $slug;
 
     /** @var string required */
-    protected $track;
+    protected string $track;
 
-    /** @var string|null */
+    protected ?string $logo = null;
-    protected $logo;
 
     /** @var string[] id => name */
-    protected $persons;
+    protected array $persons;
 
     /** @var string|null two letter code */
-    protected $language;
+    protected ?string $language = null;
 
-    /** @var string|null */
+    protected ?string $description = null;
-    protected $description;
 
     /** @var string|null license (and opt out in XML, null if not recorded, empty if no license defined) */
-    protected $recording;
+    protected ?string $recording = null;
 
     /** @var array href => title */
-    protected $links;
+    protected array $links;
 
     /** @var array href => name */
-    protected $attachments;
+    protected array $attachments;
 
-    /** @var string|null */
+    protected ?string $url = null;
-    protected $url;
 
-    /** @var string|null */
+    protected ?string $videoDownloadUrl = null;
-    protected $videoDownloadUrl;
 
     /** @var Carbon Calculated */
-    protected $endDate;
+    protected Carbon $endDate;
 
     /**
      * Event constructor.

src/Helpers/Schedule/Room.php

@@ -7,10 +7,10 @@ namespace Engelsystem\Helpers\Schedule;
 class Room
 {
     /** @var string required */
-    protected $name;
+    protected string $name;
 
     /** @var Event[] */
-    protected $event;
+    protected array $event;
 
     /**
      * Room constructor.

src/Helpers/Schedule/Schedule.php

@@ -8,14 +8,12 @@ use Carbon\Carbon;
 
 class Schedule
 {
-    /** @var string */
+    protected string $version;
-    protected $version;
 
-    /** @var Conference */
+    protected Conference $conference;
-    protected $conference;
 
     /** @var Day[] */
-    protected $day;
+    protected array $day;
 
     /**
      * @param Day[]      $days

src/Helpers/Schedule/XmlParser.php

@@ -9,22 +9,20 @@ use SimpleXMLElement;
 
 class XmlParser
 {
-    /** @var SimpleXMLElement */
+    protected SimpleXMLElement $scheduleXML;
-    protected $scheduleXML;
 
-    /** @var Schedule */
+    protected Schedule $schedule;
-    protected $schedule;
 
     public function load(string $xml): bool
     {
-        $this->scheduleXML = simplexml_load_string($xml);
+        $scheduleXML = simplexml_load_string($xml);
 
-        if (!$this->scheduleXML) {
+        if (!$scheduleXML) {
             return false;
         }
 
+        $this->scheduleXML = $scheduleXML;
         $this->parseXml();
-
         return true;
     }
 

src/Helpers/Translation/TranslationServiceProvider.php

@@ -13,8 +13,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
 
 class TranslationServiceProvider extends ServiceProvider
 {
-    /** @var GettextTranslator */
+    protected GettextTranslator|array $translators = [];
-    protected $translators = [];
 
     public function register(): void
     {

src/Helpers/Translation/Translator.php

@@ -5,13 +5,11 @@ namespace Engelsystem\Helpers\Translation;
 class Translator
 {
     /** @var string[] */
-    protected $locales;
+    protected array $locales;
 
-    /** @var string */
+    protected string $locale;
-    protected $locale;
 
-    /** @var string */
+    protected string $fallbackLocale;
-    protected $fallbackLocale;
 
     /** @var callable */
     protected $getTranslatorCallback;

src/Helpers/Version.php

@@ -6,14 +6,11 @@ use Engelsystem\Config\Config;
 
 class Version
 {
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
-    /** @vat string */
+    protected string $storage;
-    protected $storage;
 
-    /** @var string */
+    protected string $versionFile = 'VERSION';
-    protected $versionFile = 'VERSION';
 
     public function __construct(string $storage, Config $config)
     {

src/Http/Exceptions/HttpException.php

@@ -7,11 +7,10 @@ use Throwable;
 
 class HttpException extends RuntimeException
 {
-    /** @var int */
+    protected int $statusCode;
-    protected $statusCode;
 
     /** @var array */
-    protected $headers = [];
+    protected array $headers = [];
 
     /**
      * @param array          $headers

src/Http/Exceptions/ValidationException.php

@@ -8,8 +8,7 @@ use Throwable;
 
 class ValidationException extends RuntimeException
 {
-    /** @var Validator */
+    protected Validator $validator;
-    protected $validator;
 
     /**
      * @param Throwable|null $previous

src/Http/Redirector.php

@@ -4,14 +4,11 @@ namespace Engelsystem\Http;
 
 class Redirector
 {
-    /** @var Request */
+    protected Request $request;
-    protected $request;
 
-    /** @var Response */
+    protected Response $response;
-    protected $response;
 
-    /** @var UrlGeneratorInterface */
+    protected UrlGeneratorInterface $url;
-    protected $url;
 
     public function __construct(Request $request, Response $response, UrlGeneratorInterface $url)
     {

src/Http/Response.php

@@ -12,27 +12,13 @@ class Response extends SymfonyResponse implements ResponseInterface
 {
     use MessageTrait;
 
-    /**
-     * @var SessionInterface
-     */
-    protected $session;
-
-    /** @var Renderer */
-    protected $renderer;
-
-    /**
-     * @param array            $headers
-     */
     public function __construct(
         string $content = '',
         int $status = 200,
         array $headers = [],
-        Renderer $renderer = null,
+        protected ?Renderer $renderer = null,
-        SessionInterface $session = null
+        protected ?SessionInterface $session = null
     ) {
-        $this->renderer = $renderer;
-        $this->session = $session;
-
         parent::__construct($content, $status, $headers);
     }
 

src/Http/Validation/ValidatesRequest.php

@@ -7,8 +7,7 @@ use Engelsystem\Http\Request;
 
 trait ValidatesRequest
 {
-    /** @var Validator */
+    protected Validator $validator;
-    protected $validator;
 
     /**
      * @param array   $rules

src/Http/Validation/Validator.php

@@ -10,13 +10,13 @@ use Respect\Validation\Validator as RespectValidator;
 class Validator
 {
     /** @var string[] */
-    protected $errors = [];
+    protected array $errors = [];
 
     /** @var array */
-    protected $data = [];
+    protected array $data = [];
 
     /** @var array */
-    protected $mapping = [
+    protected array $mapping = [
         'accepted' => 'TrueVal',
         'int'      => 'IntVal',
         'float'    => 'FloatVal',
@@ -24,7 +24,7 @@ class Validator
     ];
 
     /** @var array */
-    protected $nestedRules = ['optional', 'not'];
+    protected array $nestedRules = ['optional', 'not'];
 
     /**
      * @param array $data

src/Logger/Logger.php

@@ -11,7 +11,8 @@ use Throwable;
 
 class Logger extends AbstractLogger
 {
-    protected $allowedLevels = [
+    /** @var array<string> */
+    protected $allowedLevels = [ // phpcs:ignore
         LogLevel::ALERT,
         LogLevel::CRITICAL,
         LogLevel::DEBUG,
@@ -22,8 +23,7 @@ class Logger extends AbstractLogger
         LogLevel::WARNING,
     ];
 
-    /** @var LogEntry */
+    protected LogEntry $log;
-    protected $log;
 
     public function __construct(LogEntry $log)
     {

src/Logger/UserAwareLogger.php

@@ -8,8 +8,7 @@ use Stringable;
 
 class UserAwareLogger extends Logger
 {
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
     /**
      * Logs with an arbitrary level and prepends the user

src/Mail/EngelsystemMailer.php

@@ -9,14 +9,11 @@ use Symfony\Component\Mailer\MailerInterface;
 
 class EngelsystemMailer extends Mailer
 {
-    /** @var Renderer|null */
+    protected ?Renderer $view = null;
-    protected $view;
 
-    /** @var Translator|null */
+    protected ?Translator $translation = null;
-    protected $translation;
 
-    /** @var string */
+    protected ?string $subjectPrefix = null;
-    protected $subjectPrefix = null;
 
     /**
      * @param Renderer|null   $view

src/Mail/Mailer.php

@@ -7,14 +7,11 @@ use Symfony\Component\Mime\Email;
 
 class Mailer
 {
-    /** @var MailerInterface */
+    protected MailerInterface $mailer;
-    protected $mailer;
 
-    /** @var string */
+    protected string $fromAddress = '';
-    protected $fromAddress = '';
 
-    /** @var string */
+    protected ?string $fromName = null;
-    protected $fromName = null;
 
     public function __construct(MailerInterface $mailer)
     {

src/Mail/Transport/LogTransport.php

@@ -8,8 +8,7 @@ use Symfony\Component\Mailer\Transport\AbstractTransport;
 
 class LogTransport extends AbstractTransport
 {
-    /** @var LoggerInterface */
+    protected LoggerInterface $logger;
-    protected $logger;
 
     public function __construct(LoggerInterface $logger)
     {

src/Middleware/AddHeaders.php

@@ -10,8 +10,7 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 class AddHeaders implements MiddlewareInterface
 {
-    /** @var Config */
+    protected Config $config;
-    protected $config;
 
     public function __construct(Config $config)
     {

src/Middleware/CallableHandler.php

@@ -15,8 +15,7 @@ class CallableHandler implements MiddlewareInterface, RequestHandlerInterface
     /** @var callable */
     protected $callable;
 
-    /** @var Container */
+    protected ?Container $container = null;
-    protected $container;
 
     /**
      * @param callable  $callable The callable that should be wrapped

src/Middleware/Dispatcher.php

@@ -15,22 +15,16 @@ class Dispatcher implements MiddlewareInterface, RequestHandlerInterface
     use ResolvesMiddlewareTrait;
 
     /** @var MiddlewareInterface[]|string[] */
-    protected $stack;
+    protected array $stack;
 
-    /** @var Application */
+    protected RequestHandlerInterface $next;
-    protected $container;
-
-    /** @var RequestHandlerInterface */
-    protected $next;
 
     /**
      * @param MiddlewareInterface[]|string[] $stack
-     * @param Application|null               $container
      */
-    public function __construct(array $stack = [], Application $container = null)
+    public function __construct(array $stack = [], protected ?Application $container = null)
     {
         $this->stack = $stack;
-        $this->container = $container;
     }
 
     /**

src/Middleware/ErrorHandler.php

@@ -16,18 +16,16 @@ use Twig\Loader\LoaderInterface as TwigLoader;
 
 class ErrorHandler implements MiddlewareInterface
 {
-    /** @var TwigLoader */
+    protected TwigLoader $loader;
-    protected $loader;
 
-    /** @var string */
+    protected string $viewPrefix = 'errors/';
-    protected $viewPrefix = 'errors/';
 
     /**
      * A list of inputs that are not saved from form input
      *
      * @var array
      */
-    protected $formIgnore = [
+    protected array $formIgnore = [
         'password',
         'password_confirmation',
         'password2',

src/Middleware/ExceptionHandler.php

@@ -12,8 +12,7 @@ use Throwable;
 
 class ExceptionHandler implements MiddlewareInterface
 {
-    /** @var ContainerInterface */
+    protected ContainerInterface $container;
-    protected $container;
 
     public function __construct(ContainerInterface $container)
     {

src/Middleware/LegacyMiddleware.php

@@ -13,7 +13,8 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 class LegacyMiddleware implements MiddlewareInterface
 {
-    protected $free_pages = [
+    /** @var array<string> */
+    protected array $free_pages = [
         'admin_event_config',
         'angeltypes',
         'atom',
@@ -28,11 +29,9 @@ class LegacyMiddleware implements MiddlewareInterface
         'admin_shifts_history',
     ];
 
-    /** @var ContainerInterface */
+    protected ContainerInterface $container;
-    protected $container;
 
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
     public function __construct(ContainerInterface $container, Authenticator $auth)
     {

src/Middleware/RequestHandler.php

@@ -16,8 +16,7 @@ class RequestHandler implements MiddlewareInterface
 {
     use ResolvesMiddlewareTrait;
 
-    /** @var Application */
+    protected Application $container;
-    protected $container;
 
     public function __construct(Application $container)
     {

src/Middleware/RouteDispatcher.php

@@ -12,14 +12,11 @@ use Psr\Http\Server\RequestHandlerInterface;
 
 class RouteDispatcher implements MiddlewareInterface
 {
-    /** @var FastRouteDispatcher */
+    protected FastRouteDispatcher $dispatcher;
-    protected $dispatcher;
 
-    /** @var ResponseInterface */
+    protected ResponseInterface $response;
-    protected $response;
 
-    /** @var MiddlewareInterface|null */
+    protected ?MiddlewareInterface $notFound = null;
-    protected $notFound;
 
     /**
      * @param ResponseInterface        $response Default response

src/Middleware/SessionHandler.php

@@ -11,11 +11,10 @@ use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface;
 
 class SessionHandler implements MiddlewareInterface
 {
-    /** @var SessionStorageInterface */
+    protected SessionStorageInterface $session;
-    protected $session;
 
     /** @var string[] */
-    protected $paths = [];
+    protected array $paths = [];
 
     /**
      * @param array                   $paths

src/Middleware/SetLocale.php

@@ -12,14 +12,11 @@ use Symfony\Component\HttpFoundation\Session\Session;
 
 class SetLocale implements MiddlewareInterface
 {
-    /** @var Authenticator */
+    protected Authenticator $auth;
-    protected $auth;
 
-    /** @var Translator */
+    protected Translator $translator;
-    protected $translator;
 
-    /** @var Session */
+    protected Session $session;
-    protected $session;
 
     public function __construct(Translator $translator, Session $session, Authenticator $auth)
     {

src/Middleware/VerifyCsrfToken.php

@@ -11,8 +11,7 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 class VerifyCsrfToken implements MiddlewareInterface
 {
-    /** @var SessionInterface */
+    protected SessionInterface $session;
-    protected $session;
 
     public function __construct(SessionInterface $session)
     {

src/Models/AngelType.php

@@ -43,8 +43,8 @@ class AngelType extends BaseModel
 {
     use HasFactory;
 
-    /** @var string[] */
+    /** @var array<string> */
-    protected $fillable = [
+    protected $fillable = [ // phpcs:ignore
         'name',
         'description',
 
@@ -60,7 +60,7 @@ class AngelType extends BaseModel
     ];
 
     /** @var array<string, string> */
-    protected $casts = [
+    protected $casts = [ // phpcs:ignore
         'restricted'              => 'boolean',
         'requires_driver_license' => 'boolean',
         'no_self_signup'          => 'boolean',

src/Models/BaseModel.php

@@ -16,5 +16,5 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 abstract class BaseModel extends Model
 {
     /** @var bool Disable timestamps by default because of "Datensparsamkeit" */
-    public $timestamps = false;
+    public $timestamps = false; // phpcs:ignore
 }

src/Models/EventConfig.php

@@ -19,19 +19,19 @@ use Illuminate\Database\Query\Builder as QueryBuilder;
 class EventConfig extends BaseModel
 {
     /** @var string The primary key for the model */
-    protected $primaryKey = 'name';
+    protected $primaryKey = 'name'; // phpcs:ignore
 
     /** @var bool Indicates if the IDs are auto-incrementing */
-    public $incrementing = false;
+    public $incrementing = false; // phpcs:ignore
 
     /** @var string Required because it is not event_configs */
-    protected $table = 'event_config';
+    protected $table = 'event_config'; // phpcs:ignore
 
     /** @var array Values that are mass assignable */
-    protected $fillable = ['name', 'value'];
+    protected $fillable = ['name', 'value']; // phpcs:ignore
 
-    /** @var array The configuration values that should be cast to native types */
+    /** @var array<string, string> The configuration values that should be cast to native types */
-    protected $valueCasts = [
+    protected array $valueCasts = [
         'buildup_start' => 'datetime_human',
         'event_start'   => 'datetime_human',
         'event_end'     => 'datetime_human',
@@ -40,7 +40,7 @@ class EventConfig extends BaseModel
     ];
 
     /** @var bool It could be interesting to know when a value changed the last time */
-    public $timestamps = true;
+    public $timestamps = true; // phpcs:ignore
 
     /**
      * Value accessor

src/Models/Faq.php

@@ -24,13 +24,13 @@ class Faq extends BaseModel
     use HasFactory;
 
     /** @var bool Enable timestamps */
-    public $timestamps = true;
+    public $timestamps = true; // phpcs:ignore
 
     /** @var string The models table */
-    public $table = 'faq';
+    public $table = 'faq'; // phpcs:ignore
 
-    /** @var string[] */
+    /** @var array<string> */
-    protected $fillable = [
+    protected $fillable = [ // phpcs:ignore
         'question',
         'text',
     ];