Merge develop into master: PHP 8.4 LDAP auth fix (ldaprecord v3 upgrade)

Author: jorikfon

App/Module.php

@@ -34,7 +34,7 @@ class Module implements ModuleDefinitionInterface
      *
      * @param \Phalcon\Di\DiInterface $container
      */
-    public function registerAutoloaders(DiInterface $container = null){
+    public function registerAutoloaders(?DiInterface $container = null){
 
     }
 

Lib/AnswerStructure.php

@@ -56,7 +56,7 @@ class AnswerStructure
      *
      * @param PBXApiResult|null $res The PBXApiResult object to initialize from (optional).
      */
-    public function __construct(PBXApiResult $res = null)
+    public function __construct(?PBXApiResult $res = null)
     {
         // Initialize default values
         $this->success = false;

Lib/UsersUILdapAuth.php

@@ -252,7 +252,7 @@ public function checkAuthViaLdap(string $username, string $password, string &$me
             $this->connection->connect();
             Container::addConnection($this->connection);
 
-            $dispatcher = Container::getEventDispatcher();
+            $dispatcher = Container::getDispatcher();
 
             // Listen for failed authentication event
             $dispatcher->listen(Failed::class, function (Failed $event) use (&$message) {
@@ -297,7 +297,12 @@ public function checkAuthViaLdap(string $username, string $password, string &$me
         }
 
         if (!$success) {
-            $this->di->get(LoggerAuthProvider::SERVICE_NAME)->warning("LDAP authentication {$username} failed: {$message}");
+            // WorkerApiCommands DI doesn't register loggerAuth; fall back to syslog there.
+            if ($this->di->has(LoggerAuthProvider::SERVICE_NAME)) {
+                $this->di->get(LoggerAuthProvider::SERVICE_NAME)->warning("LDAP authentication {$username} failed: {$message}");
+            } else {
+                \MikoPBX\Core\System\SystemMessages::sysLogMsg('web_auth', "LDAP authentication {$username} failed: {$message}", LOG_WARNING);
+            }
         }
 
         return $success;
@@ -390,7 +395,7 @@ public function getUsersList(): AnswerStructure
             $this->connection->connect();
             Container::addConnection($this->connection);
 
-            $dispatcher = Container::getEventDispatcher();
+            $dispatcher = Container::getDispatcher();
             $dispatcher->listen(Failed::class, function (Failed $event) use (&$message) {
                 $ldap = $event->getConnection();
                 $message = $ldap->getDiagnosticMessage();

composer.json

@@ -2,8 +2,8 @@
     "name": "mikopbx/moduleusersui",
     "description": "ModuleUsersUI",
     "require": {
-        "php": "^7.4",
-        "directorytree/ldaprecord": "^v2.20.5"
+        "php": "^8.1",
+        "directorytree/ldaprecord": "^v3.0"
     },
     "autoload": {
         "psr-4": {
@@ -63,7 +63,7 @@
     "config": {
         "sort-packages": true,
         "platform": {
-            "php": "7.4.0"
+            "php": "8.1.0"
         }
     }
 }