git: 90ebf10b5ad1 - main - net/phpldapadmin: Add support for php85

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=90ebf10b5ad1e4d4efd72a8baee270c6a2737b08

commit 90ebf10b5ad1e4d4efd72a8baee270c6a2737b08
Author:     Krzysztof <ports@bsdserwis.com>
AuthorDate: 2026-06-13 00:47:47 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-06-13 00:49:23 +0000

    net/phpldapadmin: Add support for php85
    
    PR:             295877
    Sponsored by:   UNIS Labs
---
 net/phpldapadmin/Makefile                         |  2 +-
 net/phpldapadmin/files/patch-lib_PLAAttribute.php | 12 +++++++++
 net/phpldapadmin/files/patch-lib_functions.php    | 22 ++++++++++++++++
 net/phpldapadmin/files/patch-lib_xml2array.php    | 31 ++++++-----------------
 4 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile
index cfaec82d2de4..193207175f49 100644
--- a/net/phpldapadmin/Makefile
+++ b/net/phpldapadmin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	phpldapadmin
 DISTVERSION=	1.2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
diff --git a/net/phpldapadmin/files/patch-lib_PLAAttribute.php b/net/phpldapadmin/files/patch-lib_PLAAttribute.php
new file mode 100644
index 000000000000..cbbe5f5638a3
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_PLAAttribute.php
@@ -0,0 +1,12 @@
+--- lib/PLAAttribute.php.orig	2024-01-10 22:23:54 UTC
++++ lib/PLAAttribute.php
+@@ -78,6 +78,9 @@ class PLAAttribute {
+ 	protected $autovalue = array();
+ 	protected $postvalue = array();
+ 
++	# php85
++	public $js = array();
++
+ 	public function __construct($name,$values,$server_id,$source=null) {
+ 		if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
+ 			debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs);
diff --git a/net/phpldapadmin/files/patch-lib_functions.php b/net/phpldapadmin/files/patch-lib_functions.php
new file mode 100644
index 000000000000..397140f9c764
--- /dev/null
+++ b/net/phpldapadmin/files/patch-lib_functions.php
@@ -0,0 +1,22 @@
+--- lib/functions.php.orig	2024-01-10 22:23:54 UTC
++++ lib/functions.php
+@@ -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)) {
+ 		[$int, $mod] = [intval($match[1]), $match[2]];
+-		$pow = [NULL => 0, 'k' => 1, 'm' => 2, 'g' => 3][$mod];
++		$pow = ["" => 0, 'k' => 1, 'm' => 2, 'g' => 3][$mod];
+ 		return $int * 1024 ** $pow;
+ 	}
+ 	return intval($value);
+@@ -2844,8 +2844,8 @@ function utime() {
+  */
+ function utime() {
+ 	$time = explode(' ',microtime());
+-	$usec = (double)$time[0];
+-	$sec = (double)$time[1];
++	$usec = (float)$time[0];
++	$sec = (float)$time[1];
+ 	return $sec + $usec;
+ }
+ 
diff --git a/net/phpldapadmin/files/patch-lib_xml2array.php b/net/phpldapadmin/files/patch-lib_xml2array.php
index c83ee9cd53c3..d01bf051423e 100644
--- a/net/phpldapadmin/files/patch-lib_xml2array.php
+++ b/net/phpldapadmin/files/patch-lib_xml2array.php
@@ -1,26 +1,11 @@
---- lib/xml2array.php.orig	2024-01-10 22:23:54 UTC
+--- lib/xml2array.php.orig	2026-06-05 14:24:55 UTC
 +++ lib/xml2array.php
-@@ -20,6 +20,7 @@ class xml2array {
- 	var $arrOutput = array();
- 	var $resParser;
- 	var $strXmlData;
-+	// var $parser;
+@@ -51,7 +51,7 @@ class xml2array {
+ 				xml_get_current_line_number($this->resParser),
+ 				$filename));
  
- 	private function push_pos(&$pos) {
- 		$this->stack[count($this->stack)] = &$pos;
-@@ -33,10 +34,12 @@ 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_object($this->resParser,$this);
-+		// xml_set_element_handler($this->resParser,'tagOpen','tagClosed');
- 
--		xml_set_character_data_handler($this->resParser,'tagData');
-+		// xml_set_character_data_handler($this->resParser,'tagData');
-+		xml_set_element_handler($this->resParser, array( $this, 'tagOpen' ), array( $this, 'tagClosed' ) );
-+		xml_set_character_data_handler( $this->resParser, array( $this, 'tagData' ));
- 
- 		$this->push_pos($this->arrOutput);
+-		xml_parser_free($this->resParser);
++		// xml_parser_free($this->resParser);
  
+ 		$output = array();
+ 		foreach ($this->arrOutput as $key => $values)