deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some PHP 8.4 deprecration fixes regarding NULL assignment to cast values on class instantiation

Browse Source
This commit is contained in:
Deon George 2025-03-15 16:04:40 +11:00
parent 4a84c25ac7
commit f667250b2c
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Classes/LDAP/Attribute/Password/SMD5.php
View File

@ -12,7 +12,7 @@ final class SMD5 extends Base
return $source === $this->encode($compare,$this->salted_salt($source)); 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)) if (is_null($salt))
$salt = hex2bin(random_salt(self::salt)); $salt = hex2bin(random_salt(self::salt));

2
app/Classes/LDAP/Attribute/Password/SSHA.php
View File

@ -12,7 +12,7 @@ final class SSHA extends Base
return $source === $this->encode($compare,$this->salted_salt($source)); 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)); return sprintf('{%s}%s',self::key,$this->salted_hash($password,'sha1',self::salt,$salt));
} }

3
app/Ldap/Connection.php
View File

@ -2,13 +2,14 @@
namespace App\Ldap; namespace App\Ldap;
use LdapRecord\Configuration\DomainConfiguration;
use LdapRecord\Connection as ConnectionBase; use LdapRecord\Connection as ConnectionBase;
use LdapRecord\LdapInterface; use LdapRecord\LdapInterface;
class Connection extends ConnectionBase class Connection extends ConnectionBase
{ {
public function __construct($config = [], LdapInterface $ldap = null) public function __construct(DomainConfiguration|array $config=[],?LdapInterface $ldap=NULL)
{ {
parent::__construct($config,$ldap); parent::__construct($config,$ldap);

2
app/Ldap/Rules/LoginObjectclassRule.php
View File

@ -14,7 +14,7 @@ use LdapRecord\Models\Model as LdapRecord;
*/ */
class LoginObjectclassRule implements Rule 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')) { if ($x=config('pla.login.objectclass')) {
return count(array_intersect($user->objectclass,$x)); return count(array_intersect($user->objectclass,$x));