git: 58c14f51d849 - 2026Q3 - net/phpldapadmin: Fix PHP 8.4 XML callback and E_STRICT deprecations

The branch 2026Q3 has been updated by nxjoseph:

URL: https://cgit.FreeBSD.org/ports/commit/?id=58c14f51d849c02e18e4e3d89d393c2f9eb3ea5d

commit 58c14f51d849c02e18e4e3d89d393c2f9eb3ea5d
Author:     Gerard Seibert <gerard_seibert@outlook.com>
AuthorDate: 2026-09-24 21:31:13 +0000
Commit:     Yusuf Yaman <nxjoseph@FreeBSD.org>
CommitDate: 2026-09-24 21:44:14 +0000

    net/phpldapadmin: Fix PHP 8.4 XML callback and E_STRICT deprecations
    
    PR:             298807
    Approved by:    Krzysztof <ports@bsdserwis.com> (maintainer)
    Approved by:    osa, vvd (Mentors, implicit)
    MFH:            2026Q3
    
    (cherry picked from commit 534e9aa094889b75681dc85a45df7c849ad5a5e9)
---
 net/phpldapadmin/Makefile                      |  2 +-
 net/phpldapadmin/files/patch-lib_functions.php |  9 +++++++++
 net/phpldapadmin/files/patch-lib_xml2array.php | 17 +++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index 193207175f49..94b8e82700ec 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	phpldapadmin
 DISTVERSION=	1.2.6.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
diff --git a/net/phpldapadmin/files/patch-lib_functions.php b/net/phpldapadmin/files/patch-lib_functions.php
index 397140f9c764..308db2562523 100644
--- a/net/phpldapadmin/files/patch-lib_functions.php
+++ b/net/phpldapadmin/files/patch-lib_functions.php
@@ -1,5 +1,14 @@
 --- lib/functions.php.orig	2024-01-10 22:23:54 UTC
 +++ lib/functions.php
+@@ -145,7 +145,7 @@ function app_error_handler($errno,$errstr,$file,$linen
+ 	$errtype = '';
+ 
+ 	switch ($errno) {
+-		case E_STRICT: $errtype = 'E_STRICT'; break;
++		case E_DEPRECATED: $errtype = 'E_DEPRECATED'; break;
+ 		case E_ERROR: $errtype = 'E_ERROR'; break;
+ 		case E_WARNING: $errtype = 'E_WARNING'; break;
+ 		case E_PARSE: $errtype = 'E_PARSE'; break;
 @@ -359,7 +359,7 @@ function memory_str_to_int($value) {
  	$value = trim(strtolower($value));
  	if (intval($value) > 0 && preg_match('/^(\d+)([kmg])?$/', $value, $match, PREG_UNMATCHED_AS_NULL)) {
diff --git a/net/phpldapadmin/files/patch-lib_xml2array.php b/net/phpldapadmin/files/patch-lib_xml2array.php
index d01bf051423e..5e82d3e46d1b 100644
--- a/net/phpldapadmin/files/patch-lib_xml2array.php
+++ b/net/phpldapadmin/files/patch-lib_xml2array.php
@@ -1,6 +1,19 @@
---- lib/xml2array.php.orig	2026-06-05 14:24:55 UTC
+--- lib/xml2array.php.orig	2024-01-10 22:23:54 UTC
 +++ lib/xml2array.php
-@@ -51,7 +51,7 @@ class xml2array {
+@@ -33,10 +33,9 @@ class xml2array {
+ 
+ 	public function parseXML($strInputXML,$filename) {
+ 		$this->resParser = xml_parser_create();
+-		xml_set_object($this->resParser,$this);
+-		xml_set_element_handler($this->resParser,'tagOpen','tagClosed');
++		xml_set_element_handler($this->resParser,[$this, 'tagOpen'],[$this, 'tagClosed']);
+ 
+-		xml_set_character_data_handler($this->resParser,'tagData');
++		xml_set_character_data_handler($this->resParser,[$this, 'tagData']);
+ 
+ 		$this->push_pos($this->arrOutput);
+ 
+@@ -48,7 +47,7 @@ class xml2array {
  				xml_get_current_line_number($this->resParser),
  				$filename));