Fix tests

Author: dmitry-ivanov

README.md

@@ -508,7 +508,7 @@ $array = [
 
 $xml = array_to_xml($array, 'Guys');
 
-// <?xml version="1.0"?>
+// <?xml version="1.0" encoding="utf-8"?>
 // <Guys>
 //    <Good_guy Rating="100">
 //        <name>Luke Skywalker</name>

composer.json

@@ -22,7 +22,7 @@
         "symfony/finder": "^5.1",
         "symfony/process": "^5.1",
         "symfony/var-dumper": "^5.1",
-        "spatie/array-to-xml": "^2.7"
+        "spatie/array-to-xml": "^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.1",

src/debug.php

@@ -28,7 +28,7 @@ function minimized_backtrace_as_string()
 
         return collect($backtrace)
             ->map(function (string $line) {
-                return preg_match('/(#\d+) .*? called at \[(.*?)]/', $line, $matches)
+                return preg_match('/(#\d+) (.*?):/', $line, $matches)
                     ? "{$matches[1]} {$matches[2]}"
                     : false;
             })

src/xml.php

@@ -26,10 +26,11 @@ function xml_to_array($xml)
      * @param array $array
      * @param string $rootElement
      * @param bool $replaceSpacesByUnderscoresInKeyNames
+     * @param string $xmlEncoding
      * @return string
      */
-    function array_to_xml(array $array, string $rootElement = '', bool $replaceSpacesByUnderscoresInKeyNames = true)
+    function array_to_xml(array $array, string $rootElement = '', bool $replaceSpacesByUnderscoresInKeyNames = true, string $xmlEncoding = 'utf-8')
     {
-        return ArrayToXml::convert($array, $rootElement, $replaceSpacesByUnderscoresInKeyNames);
+        return ArrayToXml::convert($array, $rootElement, $replaceSpacesByUnderscoresInKeyNames, $xmlEncoding);
     }
 }

tests/debug/BacktraceAsStringTest/pattern.txt

@@ -1,4 +1,4 @@
-#0  backtrace_as_string\(\) called at \[\/.*?\/tests\/debug\/BacktraceAsStringTest\.php:35\]
-#1  Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->anotherExtraMethod\(\) called at \[\/.*?\/tests\/debug\/BacktraceAsStringTest\.php:25\]
-#2  Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->getBacktrace\(\) called at \[\/.*?\/tests\/debug\/BacktraceAsStringTest\.php:13\]
-#3  Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->it_returns_backtrace_as_string_without_args\(\)
+#0 \/.*?\/tests\/debug\/BacktraceAsStringTest\.php\(35\): backtrace_as_string\(\)
+#1 \/.*?\/tests\/debug\/BacktraceAsStringTest\.php\(25\): Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->anotherExtraMethod\(\)
+#2 \/.*?\/tests\/debug\/BacktraceAsStringTest\.php\(13\): Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->getBacktrace\(\)
+#3 .*?: Illuminated\\Helpers\\Tests\\Debug\\BacktraceAsStringTest->it_returns_backtrace_as_string_without_args\(\)

tests/debug/MinimizedBacktraceAsStringTest/pattern.txt

@@ -1,4 +1,4 @@
-#0 \/.*?\/src\/debug\.php:27
-#1 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php:35
-#2 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php:25
-#3 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php:13
+#0 \/.*?\/src\/debug\.php\(27\)
+#1 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php\(35\)
+#2 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php\(25\)
+#3 \/.*?\/tests\/debug\/MinimizedBacktraceAsStringTest\.php\(13\)

tests/xml/ArrayToXmlTest/with-attributes.xml

@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root><task priority="low"><to>John</to><from>Jane</from><title>Go to the shop</title></task><task priority="medium"><to>John</to><from>Paul</from><title>Finish the report</title></task><task priority="high"><to>Jane</to><from>Jeff</from><title>Clean the house</title></task></root>

tests/xml/ArrayToXmlTest/with-custom-root.xml

@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <tasks><task><to>John</to><from>Jane</from><title>Go to the shop</title></task><task><to>John</to><from>Paul</from><title>Finish the report</title></task><task><to>Jane</to><from>Jeff</from><title>Clean the house</title></task></tasks>

tests/xml/ArrayToXmlTest/with-spaces-in-keys.xml

@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root><task><to_who>John</to_who><from_who>Jane</from_who><title>Go to the shop</title></task><task><to_who>John</to_who><from_who>Paul</from_who><title>Finish the report</title></task><task><to_who>Jane</to_who><from_who>Jeff</from_who><title>Clean the house</title></task></root>

tests/xml/ArrayToXmlTest/without-attributes.xml

@@ -1,2 +1,2 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root><task><to>John</to><from>Jane</from><title>Go to the shop</title></task><task><to>John</to><from>Paul</from><title>Finish the report</title></task><task><to>Jane</to><from>Jeff</from><title>Clean the house</title></task></root>