From 4fb559eedcf91b6a3ed08891f4085394eeb57209 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Tue, 18 Jun 2024 14:55:30 +0200
Subject: [PATCH] re #3805
---
app/views/admin/configuration/type-edit.php | 2 +-
tests/unit/_bootstrap.php | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/app/views/admin/configuration/type-edit.php b/app/views/admin/configuration/type-edit.php
index 9fddb454f0a..1cec3f094a8 100644
--- a/app/views/admin/configuration/type-edit.php
+++ b/app/views/admin/configuration/type-edit.php
@@ -16,7 +16,7 @@
<input name="value" type="number" id="item-value"
value="<?= htmlReady($value) ?>">
<? elseif ($type === 'array') : ?>
- <?php $v = version_compare(PHP_VERSION, '5.4.0', '>=') ? json_encode($value, JSON_UNESCAPED_UNICODE) : json_encode($value) ?>
+ <?php $v = json_encode($value, JSON_UNESCAPED_UNICODE) ?>
<textarea cols="80" rows="5" name="value" id="item-value"><?= htmlReady($v, true, true) ?></textarea>
<? elseif ($type === 'i18n'): ?>
<?= I18N::textarea('value', $value, [
diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php
index 87dedca7c0f..b15eeb00d7d 100644
--- a/tests/unit/_bootstrap.php
+++ b/tests/unit/_bootstrap.php
@@ -21,10 +21,7 @@
// SOFTWARE.
// set error reporting
-error_reporting(E_ALL & ~E_NOTICE);
-if (version_compare(phpversion(), '5.4', '>=')) {
- error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
-}
+error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
// set include path
$inc_path = ini_get('include_path');
--
GitLab