Merge pull request #384 from matomo-org/php84

[PHP 8.4] Explicitly mark nullable typed parameters
matomo-org · Oct 21, 2024 · 902a4d4 · 902a4d4
2 parents b1769a1 + 0aa6958
commit 902a4d4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/Auth/Base.php b/Auth/Base.php
@@ -98,7 +98,7 @@ abstract class Base implements Auth
      */
     protected $logger;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }
@@ -290,7 +290,7 @@ protected function getUserForLogin()
         return $this->userForLogin;
     }
 
-    protected function tryFallbackAuth($onlySuperUsers = true, Auth $auth = null)
+    protected function tryFallbackAuth($onlySuperUsers = true, ?Auth $auth = null)
     {
         if (empty($auth)) {
             $auth = new \Piwik\Plugins\Login\Auth();

diff --git a/LdapInterop/UserAccessAttributeParser.php b/LdapInterop/UserAccessAttributeParser.php
@@ -110,7 +110,7 @@ class UserAccessAttributeParser
      */
     private $logger;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }

diff --git a/LdapInterop/UserAccessMapper.php b/LdapInterop/UserAccessMapper.php
@@ -85,7 +85,7 @@ class UserAccessMapper
     /**
      * Constructor.
      */
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }

diff --git a/LdapInterop/UserMapper.php b/LdapInterop/UserMapper.php
@@ -76,7 +76,7 @@ class UserMapper
     /**
      * Constructor.
      */
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }

diff --git a/LdapInterop/UserSynchronizer.php b/LdapInterop/UserSynchronizer.php
@@ -108,7 +108,7 @@ class UserSynchronizer
      */
     public static $skipPasswordConfirmation = false;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }

diff --git a/Model/LdapUsers.php b/Model/LdapUsers.php
@@ -119,7 +119,7 @@ class LdapUsers
     /**
      * Constructor.
      */
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?: StaticContainer::get(LoggerInterface::class);
     }