diff options
Diffstat (limited to 'vendor/sabre/xml')
| -rw-r--r-- | vendor/sabre/xml/.travis.yml | 15 | ||||
| -rw-r--r-- | vendor/sabre/xml/CHANGELOG.md | 8 | ||||
| -rw-r--r-- | vendor/sabre/xml/composer.json | 2 | ||||
| -rw-r--r-- | vendor/sabre/xml/lib/Reader.php | 10 | ||||
| -rw-r--r-- | vendor/sabre/xml/lib/Version.php | 2 |
5 files changed, 31 insertions, 6 deletions
diff --git a/vendor/sabre/xml/.travis.yml b/vendor/sabre/xml/.travis.yml index ebca5e837..fc4a98d8e 100644 --- a/vendor/sabre/xml/.travis.yml +++ b/vendor/sabre/xml/.travis.yml @@ -8,6 +8,8 @@ php: env: global: + - RUN_PHPCSFIXER="TRUE" + - RUN_PHPUNIT="TRUE" - RUN_PHPSTAN="FALSE" matrix: - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml" @@ -15,9 +17,17 @@ env: matrix: include: + - name: 'PHP8' + dist: focal + php: nightly + env: + - RUN_PHPCSFIXER="FALSE" + - REPORT_COVERAGE="FALSE" - name: 'PHPStan' php: 7.4 env: + - RUN_PHPCSFIXER="FALSE" + - RUN_PHPUNIT="FALSE" - RUN_PHPSTAN="TRUE" - REPORT_COVERAGE="FALSE" fast_finish: true @@ -27,11 +37,12 @@ cache: - $HOME/.composer/cache before_script: + - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --dev friendsofphp/php-cs-fixer; fi - composer update $PREFER_LOWEST script: - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi - - if [ $RUN_PHPSTAN == "FALSE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi + - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi + - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi after_success: diff --git a/vendor/sabre/xml/CHANGELOG.md b/vendor/sabre/xml/CHANGELOG.md index 9d70609f8..cdd21fe51 100644 --- a/vendor/sabre/xml/CHANGELOG.md +++ b/vendor/sabre/xml/CHANGELOG.md @@ -1,6 +1,14 @@ ChangeLog ========= +2.2.3 (2020-10-03) +------------------ +* #191: add changelog and version bump that was missed in 2.2.2 + +2.2.2 (2020-10-03) +------------------ +* #190: adjust libxml_disable_entity_loader calls ready for PHP 8.0 (@phil-davis) + 2.2.1 (2020-05-11) ------------------ diff --git a/vendor/sabre/xml/composer.json b/vendor/sabre/xml/composer.json index 40abe149b..b54cf195b 100644 --- a/vendor/sabre/xml/composer.json +++ b/vendor/sabre/xml/composer.json @@ -5,7 +5,7 @@ "homepage" : "https://sabre.io/xml/", "license" : "BSD-3-Clause", "require" : { - "php" : "^7.1", + "php" : "^7.1 || ^8.0", "ext-xmlwriter" : "*", "ext-xmlreader" : "*", "ext-dom" : "*", diff --git a/vendor/sabre/xml/lib/Reader.php b/vendor/sabre/xml/lib/Reader.php index a28cf8c3b..368e8ffd2 100644 --- a/vendor/sabre/xml/lib/Reader.php +++ b/vendor/sabre/xml/lib/Reader.php @@ -55,7 +55,11 @@ class Reader extends XMLReader */ public function parse(): array { - $previousEntityState = libxml_disable_entity_loader(true); + $previousEntityState = null; + $shouldCallLibxmlDisableEntityLoader = (\PHP_VERSION_ID < 80000); + if ($shouldCallLibxmlDisableEntityLoader) { + $previousEntityState = libxml_disable_entity_loader(true); + } $previousSetting = libxml_use_internal_errors(true); try { @@ -78,7 +82,9 @@ class Reader extends XMLReader } } finally { libxml_use_internal_errors($previousSetting); - libxml_disable_entity_loader($previousEntityState); + if ($shouldCallLibxmlDisableEntityLoader) { + libxml_disable_entity_loader($previousEntityState); + } } return $result; diff --git a/vendor/sabre/xml/lib/Version.php b/vendor/sabre/xml/lib/Version.php index 56c5c5285..d4e465de9 100644 --- a/vendor/sabre/xml/lib/Version.php +++ b/vendor/sabre/xml/lib/Version.php @@ -16,5 +16,5 @@ class Version /** * Full version number. */ - const VERSION = '2.2.1'; + const VERSION = '2.2.3'; } |