From 07c746e024cb3c63c725181ecdb4f66108060000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1?= <aleswita@gmail.com>
Date: Wed, 25 Mar 2026 16:08:48 +0100
Subject: [PATCH 1/4] PHP 8.5 support

---
 .github/workflows/main.yaml   | 4 ++--
 src/Helpers/StringHelpers.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 53d55a6..e2b5b03 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -9,7 +9,7 @@ on:
       - 'master'
 
 env:
-  php-version: '8.3'
+  php-version: '8.5'
   php-extensions: 'json'
   composer-install: 'composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable'
 
@@ -60,7 +60,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
         operating-system: [ 'ubuntu-latest' ]
         composer-args: [ '' ]
         include:
diff --git a/src/Helpers/StringHelpers.php b/src/Helpers/StringHelpers.php
index a097c61..b3e6c36 100644
--- a/src/Helpers/StringHelpers.php
+++ b/src/Helpers/StringHelpers.php
@@ -65,7 +65,7 @@ final public static function removeWhitespace(
 		$replaceTable = [];
 
 		foreach (InvisibleSpaceCharacterCodes::getCodes() as $charCode) {
-			$replaceTable[\chr($charCode)] = '';
+			$replaceTable[\mb_chr($charCode, 'UTF-8')] = '';
 		}
 
 		return \strtr(

From a8032149dcb3fbe60dd5097755c1785ee59d2e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1?= <aleswita@gmail.com>
Date: Wed, 25 Mar 2026 16:43:11 +0100
Subject: [PATCH 2/4] Update CompanyRegistrationNumber.php

---
 src/CompanyRegistrationNumber.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CompanyRegistrationNumber.php b/src/CompanyRegistrationNumber.php
index b371fef..c7fdec1 100644
--- a/src/CompanyRegistrationNumber.php
+++ b/src/CompanyRegistrationNumber.php
@@ -98,7 +98,7 @@ private function isValidIE(
 
 		$remainder = $sum % 23;
 
-		return \chr(\ord('A') - 1 + $remainder) === $value[7];
+		return \mb_chr(\ord('A') - 1 + $remainder, 'UTF-8') === $value[7];
 	}
 
 	private function isValidCH(

From 47aea92d56cd2babf691d0eeef236b8ea04ebc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1?= <aleswita@gmail.com>
Date: Wed, 25 Mar 2026 16:44:03 +0100
Subject: [PATCH 3/4] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e2b5b03..a26f0da 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -9,7 +9,7 @@ on:
       - 'master'
 
 env:
-  php-version: '8.5'
+  php-version: '8.3'
   php-extensions: 'json'
   composer-install: 'composer update --no-interaction --no-progress --no-suggest --prefer-dist --prefer-stable'
 

From bd85c05b841e66fc64cc91ae8e26c6c07fe5b306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1?= <aleswita@gmail.com>
Date: Wed, 25 Mar 2026 16:51:39 +0100
Subject: [PATCH 4/4] Update ruleset.xml

---
 tools/cs/ruleset.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cs/ruleset.xml b/tools/cs/ruleset.xml
index 26230f7..5d363e1 100644
--- a/tools/cs/ruleset.xml
+++ b/tools/cs/ruleset.xml
@@ -32,6 +32,7 @@
 		<exclude name="SlevomatCodingStandard.Arrays.AlphabeticallySortedByKeys.IncorrectKeyOrder"/>
 		<exclude name="SlevomatCodingStandard.Classes.RequireSelfReference.RequiredSelfReference"/>
 		<exclude name="SlevomatCodingStandard.Numbers.DisallowNumericLiteralSeparator.DisallowedNumericLiteralSeparator"/>
+		<exclude name="SlevomatCodingStandard.Classes.TraitUseOrder.IncorrectOrder"/>
 
 		<!-- TODO Enable after migration to PHP 8.1 -->
 		<exclude name="SlevomatCodingStandard.Functions.FunctionLength.FunctionLength"/>