From 00b9fbda082b2f8cf1abf7b7790f99825539c26c 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 | 2 +-
 composer.json                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/adminer/include/bootstrap.inc.php b/adminer/include/bootstrap.inc.php
index 45f81367..84895396 100644
--- a/adminer/include/bootstrap.inc.php
+++ b/adminer/include/bootstrap.inc.php
@@ -1,6 +1,6 @@
 <?php
 function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
+	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
 }
 
 error_reporting(6135); // errors and warnings
diff --git a/composer.json b/composer.json
index 44845778..764580e1 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "GPL-2.0-only"
     ],
     "require": {
-        "php": "5.6 - 8.1",
+        "php": "5.6 - 8.3",
         "ext-pdo": "*",
         "ext-json": "*",
         "vrana/jush": "@dev",