diff --git a/Classes/Decorator/MatchNoteDecorator.php b/Classes/Decorator/MatchNoteDecorator.php
index 7f946c9..302be0b 100644
--- a/Classes/Decorator/MatchNoteDecorator.php
+++ b/Classes/Decorator/MatchNoteDecorator.php
@@ -14,7 +14,7 @@ class MatchNoteDecorator
     private $profileDecorator;
     private $profileProvider;
 
-    public function __construct(ProfileDecorator $profileDecorator = null, MatchProfileProvider $profileProvider)
+    public function __construct(?ProfileDecorator $profileDecorator = null, MatchProfileProvider $profileProvider)
     {
         $this->profileDecorator = $profileDecorator ?: new ProfileDecorator($this);
         $this->profileProvider = $profileProvider ?: new MatchProfileProvider();
diff --git a/Classes/Decorator/ProfileDecorator.php b/Classes/Decorator/ProfileDecorator.php
index 993d81b..8e98940 100644
--- a/Classes/Decorator/ProfileDecorator.php
+++ b/Classes/Decorator/ProfileDecorator.php
@@ -10,7 +10,7 @@ class ProfileDecorator
 {
     private $matchNoteDecorator;
 
-    public function __construct(MatchNoteDecorator $matchNoteDecorator = null)
+    public function __construct(?MatchNoteDecorator $matchNoteDecorator = null)
     {
         $this->matchNoteDecorator = $matchNoteDecorator ?: new MatchNoteDecorator($this, new MatchProfileProvider());
     }
diff --git a/Classes/Frontend/Action/ClubList.php b/Classes/Frontend/Action/ClubList.php
index 26490c8..83adc68 100644
--- a/Classes/Frontend/Action/ClubList.php
+++ b/Classes/Frontend/Action/ClubList.php
@@ -40,7 +40,7 @@ class ClubList extends AbstractAction
     /** @var ClubRepository */
     private $clubRepo;
 
-    public function __construct(ClubRepository $repo = null)
+    public function __construct(?ClubRepository $repo = null)
     {
         $this->clubRepo = $repo ?: new ClubRepository();
     }
diff --git a/Classes/Frontend/Action/ProfileList.php b/Classes/Frontend/Action/ProfileList.php
index dcdbe0b..3a0dcfc 100644
--- a/Classes/Frontend/Action/ProfileList.php
+++ b/Classes/Frontend/Action/ProfileList.php
@@ -47,7 +47,7 @@ class ProfileList extends AbstractAction
 {
     private $profileRepo;
 
-    public function __construct(ProfileRepository $repo = null)
+    public function __construct(?ProfileRepository $repo = null)
     {
         $this->profileRepo = $repo ?: new ProfileRepository();
     }
diff --git a/Classes/Frontend/Action/StadiumList.php b/Classes/Frontend/Action/StadiumList.php
index 7a739a4..9a84546 100644
--- a/Classes/Frontend/Action/StadiumList.php
+++ b/Classes/Frontend/Action/StadiumList.php
@@ -13,7 +13,7 @@ class StadiumList extends AbstractAction
 {
     private $repo;
 
-    public function __construct(StadiumRepository $repo = null)
+    public function __construct(?StadiumRepository $repo = null)
     {
         $this->repo = $repo ?: new StadiumRepository();
     }
diff --git a/Classes/Frontend/Action/TeamList.php b/Classes/Frontend/Action/TeamList.php
index 4cfd761..cd47c92 100644
--- a/Classes/Frontend/Action/TeamList.php
+++ b/Classes/Frontend/Action/TeamList.php
@@ -39,7 +39,7 @@ class TeamList extends AbstractAction
 {
     private $repo;
 
-    public function __construct(TeamRepository $repo = null)
+    public function __construct(?TeamRepository $repo = null)
     {
         $this->repo = $repo ?: new TeamRepository();
     }
diff --git a/Classes/Statistics/Service/PlayerStatistics.php b/Classes/Statistics/Service/PlayerStatistics.php
index 613028b..6348457 100644
--- a/Classes/Statistics/Service/PlayerStatistics.php
+++ b/Classes/Statistics/Service/PlayerStatistics.php
@@ -81,7 +81,7 @@ class PlayerStatistics implements StatsServiceInterface
     /** @var ProfileService */
     protected $profileSrv;
 
-    public function __construct(TeamRepository $teamRepo = null, ProfileService $profileSrv = null)
+    public function __construct(?TeamRepository $teamRepo = null, ?ProfileService $profileSrv = null)
     {
         $this->teamRepo = $teamRepo ?: new TeamRepository();
         $this->profileSrv = $profileSrv ?: new ProfileService();
diff --git a/Classes/Statistics/Statistics.php b/Classes/Statistics/Statistics.php
index a618e24..d6bcbae 100644
--- a/Classes/Statistics/Statistics.php
+++ b/Classes/Statistics/Statistics.php
@@ -45,7 +45,7 @@ class Statistics
     private $serviceKeys;
     private $servicesArrCnt;
 
-    public function __construct(MatchNoteRepository $mnRepo = null)
+    public function __construct(?MatchNoteRepository $mnRepo = null)
     {
         $this->matchRepo = new MatchRepository();
         $this->matchNodeRepo = $mnRepo ?: new MatchNoteRepository();
diff --git a/Classes/Table/DefaultMatchProvider.php b/Classes/Table/DefaultMatchProvider.php
index efe9b3b..fb5bec7 100644
--- a/Classes/Table/DefaultMatchProvider.php
+++ b/Classes/Table/DefaultMatchProvider.php
@@ -97,7 +97,7 @@ class DefaultMatchProvider implements IMatchProvider
      * @param string $confId ConfId des Views
      * @param MatchRepository $matchRepo
      */
-    public function __construct($configurations, $confId, MatchRepository $matchRepo = null)
+    public function __construct($configurations, $confId, ?MatchRepository $matchRepo = null)
     {
         $this->configurations = $configurations;
         $this->confId = $confId;
diff --git a/Classes/Utility/MatchProfileProvider.php b/Classes/Utility/MatchProfileProvider.php
index 06ad29e..34502e1 100644
--- a/Classes/Utility/MatchProfileProvider.php
+++ b/Classes/Utility/MatchProfileProvider.php
@@ -39,7 +39,7 @@ class MatchProfileProvider
     private $players = [];
     protected $profiles;
 
-    public function __construct(ProfileRepository $profileRepo = null)
+    public function __construct(?ProfileRepository $profileRepo = null)
     {
         $this->profileRepo = $profileRepo ?: new ProfileRepository();
     }
diff --git a/Classes/Utility/MatchTicker.php b/Classes/Utility/MatchTicker.php
index 197a611..68d62b7 100644
--- a/Classes/Utility/MatchTicker.php
+++ b/Classes/Utility/MatchTicker.php
@@ -52,7 +52,7 @@ class MatchTicker
     private static $cache = [];
     private $mnRepo;
 
-    public function __construct(MatchNoteRepository $mnRepo = null)
+    public function __construct(?MatchNoteRepository $mnRepo = null)
     {
         $this->mnRepo = $mnRepo ?: new MatchNoteRepository();
     }