From b6f9f58712d2b9d88946ab516b9697fe5da63e67 Mon Sep 17 00:00:00 2001
From: Sneda8 <85223444+Sneda8@users.noreply.github.com>
Date: Sun, 17 Dec 2023 01:36:25 +0100
Subject: [PATCH] PHP 8.3 error suppression

PHP 8.3 has shortened the array access on null error message to "Trying to access array offset on null". This commit changes the regular expression used to circumvent errors.
---
 adminer/include/bootstrap.inc.php | 9 +--------
 adminer/include/version.inc.php   | 7 +++++++
 changes.txt                       | 3 +++
 compile.php                       | 6 ------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 45f81367..cc5f2001 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -1,11 +1,5 @@
 <?php
-function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
-}
-
-error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
-
+include "../adminer/include/version.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -108,7 +102,6 @@ define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
 	. (DB != "" ? 'db=' . urlencode(DB) . '&' . (isset($_GET["ns"]) ? "ns=" . urlencode($_GET["ns"]) . "&" : "") : '')
 );
 
-include "../adminer/include/version.inc.php";
 include "../adminer/include/design.inc.php";
 include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 4cbf5400..a156a75c 100644
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,9 @@
 <?php
 $VERSION = "4.9.1-dev";
+
+function adminer_errors($errno, $errstr) {
+	return !!preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
+}
+
+error_reporting(6135); // errors and warnings
+set_error_handler('adminer_errors', E_WARNING);
diff --git a/changes.txt b/changes.txt
index 5c297892..8bceca72 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.9.1-dev:
+Support PHP 8.3
+
 Adminer 4.9.0:
 Validate connection to server in HTTP based drivers
 Elasticsearch 5: Make unusable driver usable again, move it to plugins
diff --git a/compile.php b/compile.php
index 73f2edb5..a9716f2a 100755
--- a/compile.php
+++ b/compile.php
@@ -1,11 +1,5 @@
 #!/usr/bin/env php
 <?php
-function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
-}
-
-error_reporting(6135); // errors and warnings
-set_error_handler('adminer_errors', E_WARNING);
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
 include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";