diff --git a/README.md b/README.md index 8936a8d..73b7ca3 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ Converts a node to a string. * `config`: A configuration array with the possible keys and value types being: - `booleanAttributeValues` (`bool|null`): Whether to include the values of boolean attributes on HTML elements during serialization. Per the standard this is `true` by default - `foreignVoidEndTags` (`bool|null`): Whether to print the end tags of foreign void elements rather than self-closing their start tags. Per the standard this is `true` by default + - `groupElements` (`bool|null`): Group like "block" elements and insert extra newlines between groups - `indentStep` (`int|null`): The number of spaces or tabs (depending on setting of indentStep) to indent at each step. This is `1` by default and has no effect unless `reformatWhitespace` is `true` - `indentWithSpaces` (`bool|null`): Whether to use spaces or tabs to indent. This is `true` by default and has no effect unless `reformatWhitespace` is `true` - `reformatWhitespace` (`bool|null`): Whether to reformat whitespace (pretty-print) or not. This is `false` by default diff --git a/composer.lock b/composer.lock index 12fcdf9..542c973 100644 --- a/composer.lock +++ b/composer.lock @@ -54,16 +54,16 @@ }, { "name": "mensbeam/html-parser", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/mensbeam/HTML-Parser.git", - "reference": "c1dc4b55ceeb5c93e14a8cc0715f501caeead506" + "reference": "61b842fa74564280ab899bc26dcc5ca7d3f8ffaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mensbeam/HTML-Parser/zipball/c1dc4b55ceeb5c93e14a8cc0715f501caeead506", - "reference": "c1dc4b55ceeb5c93e14a8cc0715f501caeead506", + "url": "https://api.github.com/repos/mensbeam/HTML-Parser/zipball/61b842fa74564280ab899bc26dcc5ca7d3f8ffaf", + "reference": "61b842fa74564280ab899bc26dcc5ca7d3f8ffaf", "shasum": "" }, "require": { @@ -119,9 +119,9 @@ ], "support": { "issues": "https://github.com/mensbeam/HTML-Parser/issues", - "source": "https://github.com/mensbeam/HTML-Parser/tree/1.2.3" + "source": "https://github.com/mensbeam/HTML-Parser/tree/1.2.4" }, - "time": "2022-02-14T15:18:44+00:00" + "time": "2022-02-15T18:24:04+00:00" }, { "name": "mensbeam/intl", diff --git a/lib/XMLDocument.php b/lib/XMLDocument.php index ab0f5fa..2d50d13 100644 --- a/lib/XMLDocument.php +++ b/lib/XMLDocument.php @@ -18,6 +18,7 @@ class XMLDocument extends Document { throw new DOMException(DOMException::NO_MODIFICATION_ALLOWED); } + $this->_innerNode->encoding = Charset::fromCharset((string)$charset) ?? 'UTF-8'; $this->_innerNode->loadXML($source); } } \ No newline at end of file diff --git a/vendor-bin/robo/composer.lock b/vendor-bin/robo/composer.lock index 5759622..22ab815 100644 --- a/vendor-bin/robo/composer.lock +++ b/vendor-bin/robo/composer.lock @@ -64,21 +64,21 @@ }, { "name": "consolidation/config", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "955829fde0d101cfdd0d59e19cec5c1080250a3b" + "reference": "0eacfc0a883716fe814b974a9771f83ee7d2f46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/955829fde0d101cfdd0d59e19cec5c1080250a3b", - "reference": "955829fde0d101cfdd0d59e19cec5c1080250a3b", + "url": "https://api.github.com/repos/consolidation/config/zipball/0eacfc0a883716fe814b974a9771f83ee7d2f46f", + "reference": "0eacfc0a883716fe814b974a9771f83ee7d2f46f", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3", - "grasmash/expander": "^1", + "grasmash/expander": "^1 || ^2", "php": ">=7.1.3", "psr/log": "^1.1", "symfony/event-dispatcher": "^4||^5" @@ -119,9 +119,9 @@ "description": "Provide configuration services for a commandline tool.", "support": { "issues": "https://github.com/consolidation/config/issues", - "source": "https://github.com/consolidation/config/tree/2.0.3" + "source": "https://github.com/consolidation/config/tree/2.0.4" }, - "time": "2022-02-13T15:27:05+00:00" + "time": "2022-02-15T17:41:57+00:00" }, { "name": "consolidation/log", @@ -427,30 +427,37 @@ }, { "name": "dflydev/dot-access-data", - "version": "v1.1.0", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/dflydev/dflydev-dot-access-data.git", - "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a" + "reference": "0992cc19268b259a39e86f296da5f0677841f42c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a", - "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c", + "reference": "0992cc19268b259a39e86f296da5f0677841f42c", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.42", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", + "scrutinizer/ocular": "1.6.0", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^3.14" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "3.x-dev" } }, "autoload": { - "psr-0": { - "Dflydev\\DotAccessData": "src" + "psr-4": { + "Dflydev\\DotAccessData\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -472,6 +479,11 @@ "name": "Carlos Frutos", "email": "carlos@kiwing.it", "homepage": "https://github.com/cfrutos" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com" } ], "description": "Given a deep data structure, access data by dot notation.", @@ -484,33 +496,34 @@ ], "support": { "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", - "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/master" + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.1" }, - "time": "2017-01-20T21:14:22+00:00" + "time": "2021-08-13T13:06:58+00:00" }, { "name": "grasmash/expander", - "version": "1.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/grasmash/expander.git", - "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f" + "reference": "84c256112763e00d09b437d269897339ca1ceaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f", - "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f", + "url": "https://api.github.com/repos/grasmash/expander/zipball/84c256112763e00d09b437d269897339ca1ceaf4", + "reference": "84c256112763e00d09b437d269897339ca1ceaf4", "shasum": "" }, "require": { - "dflydev/dot-access-data": "^1.1.0", - "php": ">=5.4" + "dflydev/dot-access-data": "^3.0.0", + "php": ">=5.6", + "psr/log": "^1.0" }, "require-dev": { "greg-1-anderson/composer-test-scenarios": "^1", - "phpunit/phpunit": "^4|^5.5.4", - "satooshi/php-coveralls": "^1.0.2|dev-master", - "squizlabs/php_codesniffer": "^2.7" + "php-coveralls/php-coveralls": "^2.0", + "phpunit/phpunit": "^6.0 || ^8.0 || ^9", + "squizlabs/php_codesniffer": "^2.7 || ^3.3" }, "type": "library", "extra": { @@ -535,9 +548,9 @@ "description": "Expands internal property references in PHP arrays file.", "support": { "issues": "https://github.com/grasmash/expander/issues", - "source": "https://github.com/grasmash/expander/tree/master" + "source": "https://github.com/grasmash/expander/tree/2.0.0" }, - "time": "2017-12-21T22:14:55+00:00" + "time": "2021-12-08T01:46:56+00:00" }, { "name": "league/container",