PHP 8.1 (#152)

* update ci builds to include php 8.1

* fix null to preg_replace()

* handle null sanitise

* fix cs

Author: ziadoz

.github/workflows/continuous-integration.yml

@@ -16,6 +16,7 @@ jobs:
       matrix:
         php-version:
           - '8.0'
+          - '8.1'
     steps:
       - uses: actions/checkout@v2
 

src/Writer/Xml/XmlFormatter.php

@@ -14,10 +14,14 @@ class XmlFormatter
      * @see   http://www.phpwact.org/php/i18n/charsets#common_problem_areas_with_utf-8
      * @see   http://www.xiven.com/weblog/2013/08/30/PHPInvalidUTF8InXMLRevisited
      */
-    public static function sanitise(string|null $string): string
+    public static function sanitise(string|null $value): string
     {
+        if ($value === null) {
+            return '';
+        }
+
         // Only allow Tab (9), LF (10), CR (13), Space (32) - 55295, 57344 - 65533, 65536 - 1114111.
-        return preg_replace('/[^\x{0009}\x{000A}\x{000D}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', ' ', $string);
+        return preg_replace('/[^\x{0009}\x{000A}\x{000D}\x{0020}-\x{D7FF}\x{E000}-\x{FFFD}\x{10000}-\x{10FFFF}]/u', ' ', $value);
     }
 
     // Convert a boolean into a string for use in XML output.

tests/Writer/Xml/XmlFormatterTest.php

@@ -11,11 +11,23 @@
 
 class XmlFormatterTest extends TestCase
 {
-    public function test_sanitise(): void
+    /**
+     * @dataProvider sanitise_data_provider
+     *
+     * @param mixed $value
+     * @param mixed $expectedResult
+     */
+    public function test_sanitise($value, $expectedResult): void
     {
-        $invalidChar = chr(30); // Record Separator.
+        $this->assertSame($expectedResult, XmlFormatter::sanitise($value));
+    }
 
-        $this->assertSame('Foo Bar', XmlFormatter::sanitise('Foo' . $invalidChar . 'Bar'));
+    public function sanitise_data_provider(): iterable
+    {
+        return [
+            'null'             => [null, ''],
+            'record separator' => ['Foo' . chr(30) . 'Bar', 'Foo Bar'],
+        ];
     }
 
     /**