Merge pull request #75 from hason/master

Enable PHP 8.1 and Symfony 6
goetas · Dec 21, 2021 · 5170c37 · 5170c37
2 parents 188403e + be394ec
commit 5170c37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         dependencies: ['', 'lowest']
-        php: [ '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
         twig: [ ^1.0, ^2.0, ^3.0 ]
         exclude:
           - php: '7.1'

diff --git a/composer.json b/composer.json
@@ -19,13 +19,13 @@
         "ext-dom": "*",
         "masterminds/html5" : "^2.1.2",
         "twig/twig" : "^1.43|^2.13|^3.0",
-        "symfony/event-dispatcher" : "^3.4|^4.4|^5.1"
+        "symfony/event-dispatcher" : "^3.4|^4.4|^5.1|^6.0"
     },
     "require-dev" : {
         "phpunit/phpunit" : "^7.5|^8.0|^9.0",
-        "friendsofphp/php-cs-fixer": "^2.2",
+        "friendsofphp/php-cs-fixer": "^2.19",
         "scrutinizer/ocular": "^1.3",
-        "symfony/var-dumper": "^3.4|^4.4|^5.1"
+        "symfony/var-dumper": "^3.4|^4.4|^5.1|^6.0"
     },
     "autoload" : {
         "psr-4" : {

diff --git a/src/SourceAdapter/XMLAdapter.php b/src/SourceAdapter/XMLAdapter.php
@@ -69,7 +69,6 @@ protected function createDom($source)
 
         $dom = new \DOMDocument('1.0', 'UTF-8');
         if ('' !== trim($source) && !$dom->loadXML($source, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
-
             throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors)));
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,6 @@ protected function createDom($source) @@
             $dom = new \DOMDocument('1.0', 'UTF-8');
             if ('' !== trim($source) && !$dom->loadXML($source, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
                 throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors)));
             }
@@ Expand Down @@