From f667250b2cb97a070f1903f1a60d2f76f571901b Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 15 Mar 2025 16:04:40 +1100 Subject: [PATCH] Some PHP 8.4 deprecration fixes regarding NULL assignment to cast values on class instantiation --- app/Classes/LDAP/Attribute/Password/SMD5.php | 2 +- app/Classes/LDAP/Attribute/Password/SSHA.php | 2 +- app/Ldap/Connection.php | 3 ++- app/Ldap/Rules/LoginObjectclassRule.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Classes/LDAP/Attribute/Password/SMD5.php b/app/Classes/LDAP/Attribute/Password/SMD5.php index 0894f30b..ed77957e 100644 --- a/app/Classes/LDAP/Attribute/Password/SMD5.php +++ b/app/Classes/LDAP/Attribute/Password/SMD5.php @@ -12,7 +12,7 @@ final class SMD5 extends Base return $source === $this->encode($compare,$this->salted_salt($source)); } - public function encode(string $password,string $salt=NULL): string + public function encode(string $password,?string $salt=NULL): string { if (is_null($salt)) $salt = hex2bin(random_salt(self::salt)); diff --git a/app/Classes/LDAP/Attribute/Password/SSHA.php b/app/Classes/LDAP/Attribute/Password/SSHA.php index 8daa32b7..708e821f 100644 --- a/app/Classes/LDAP/Attribute/Password/SSHA.php +++ b/app/Classes/LDAP/Attribute/Password/SSHA.php @@ -12,7 +12,7 @@ final class SSHA extends Base return $source === $this->encode($compare,$this->salted_salt($source)); } - public function encode(string $password,string $salt=NULL): string + public function encode(string $password,?string $salt=NULL): string { return sprintf('{%s}%s',self::key,$this->salted_hash($password,'sha1',self::salt,$salt)); } diff --git a/app/Ldap/Connection.php b/app/Ldap/Connection.php index b749c81e..c9c25b96 100644 --- a/app/Ldap/Connection.php +++ b/app/Ldap/Connection.php @@ -2,13 +2,14 @@ namespace App\Ldap; +use LdapRecord\Configuration\DomainConfiguration; use LdapRecord\Connection as ConnectionBase; use LdapRecord\LdapInterface; class Connection extends ConnectionBase { - public function __construct($config = [], LdapInterface $ldap = null) + public function __construct(DomainConfiguration|array $config=[],?LdapInterface $ldap=NULL) { parent::__construct($config,$ldap); diff --git a/app/Ldap/Rules/LoginObjectclassRule.php b/app/Ldap/Rules/LoginObjectclassRule.php index b7453933..0b9c8037 100644 --- a/app/Ldap/Rules/LoginObjectclassRule.php +++ b/app/Ldap/Rules/LoginObjectclassRule.php @@ -14,7 +14,7 @@ use LdapRecord\Models\Model as LdapRecord; */ class LoginObjectclassRule implements Rule { - public function passes(LdapRecord $user, Eloquent $model = null): bool + public function passes(LdapRecord $user,?Eloquent $model=NULL): bool { if ($x=config('pla.login.objectclass')) { return count(array_intersect($user->objectclass,$x));