From 7ce2c3949b5d3a8f918e5ea2000da66f0ab6f826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=BCnch?= Date: Thu, 7 Sep 2023 10:11:47 +0200 Subject: [PATCH] Fix php incompatibility --- src/N98/Util/Unicode/Charset.php | 6 +++--- tests/N98/Util/Unicode/CharsetTest.php | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/N98/Util/Unicode/Charset.php b/src/N98/Util/Unicode/Charset.php index a644e50ac..3b5eaaee2 100644 --- a/src/N98/Util/Unicode/Charset.php +++ b/src/N98/Util/Unicode/Charset.php @@ -27,10 +27,10 @@ class Charset * @param int|array $codes * @return string */ - public static function convertInteger($codes) + public static function convertInteger(...$codes) { - if (is_scalar($codes)) { - $codes = func_get_args(); + if (count($codes) === 1 && is_array($codes[0])) { + $codes = $codes[0]; } $str = ''; diff --git a/tests/N98/Util/Unicode/CharsetTest.php b/tests/N98/Util/Unicode/CharsetTest.php index 3b99fc72b..674603288 100644 --- a/tests/N98/Util/Unicode/CharsetTest.php +++ b/tests/N98/Util/Unicode/CharsetTest.php @@ -8,5 +8,13 @@ public function testConvertInteger() { $this->assertEquals('✖', Charset::convertInteger(Charset::UNICODE_CROSS_CHAR)); $this->assertEquals('✔', Charset::convertInteger(Charset::UNICODE_CHECKMARK_CHAR)); + $this->assertEquals( + '✔✖', + Charset::convertInteger(Charset::UNICODE_CHECKMARK_CHAR, Charset::UNICODE_CROSS_CHAR) + ); + $this->assertEquals( + '✖✔', + Charset::convertInteger([Charset::UNICODE_CROSS_CHAR, Charset::UNICODE_CHECKMARK_CHAR]) + ); } }