Merge pull request #73 from hason-contributions/php8

Enable PHP 8.0 and use Github Actions

.github/workflows/tests.yml

@@ -0,0 +1,48 @@
+name: Tests
+
+on:
+  push: ~
+  pull_request: ~
+
+jobs:
+  phpunit:
+    name: PHPUnit on ${{ matrix.php }} and Twig ${{ matrix.twig }} ${{ matrix.dependencies }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        dependencies: ['', 'lowest']
+        php: [ '7.1', '7.2', '7.3', '7.4', '8.0' ]
+        twig: [ ^1.0, ^2.0, ^3.0 ]
+        exclude:
+          - php: '7.1'
+            twig: ^3.0
+    steps:
+      - name: Update code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom
+          coverage: pcov
+          tools: composer:v2
+
+      - name: Install dependencies
+        run: composer update --no-progress --with "twig/twig:${{ matrix.twig }}"
+
+      - name: Install lowest dependencies
+        run: composer update --no-progress --prefer-lowest --root-reqs --with "twig/twig:${{ matrix.twig }}"
+        if: matrix.dependencies
+
+      - name: Run tests
+        run: vendor/bin/phpunit --no-coverage
+        if: matrix.php != '8.0'
+
+      - name: Run tests with code coverage
+        run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+        if: matrix.php == '8.0'
+
+      - name: Upload code coverage tu Scrutinizer
+        run: php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+        if: matrix.php == '8.0'

composer.json

@@ -15,17 +15,17 @@
     "homepage" : "https://github.com/goetas/twital",
     "license" : "MIT",
     "require" : {
-        "php" : "^5.5|^7.0",
+        "php" : "^7.1|^8.0",
         "ext-dom": "*",
         "masterminds/html5" : "^2.1.2",
-        "twig/twig" : "^1.38|^2.4|^3.0",
-        "symfony/event-dispatcher" : "^3.0|^4.0|^5.0"
+        "twig/twig" : "^1.43|^2.13|^3.0",
+        "symfony/event-dispatcher" : "^3.4|^4.4|^5.1"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "4.8.34|^5.6.3|^6.0|^7.0",
+        "phpunit/phpunit" : "^7.5|^8.0|^9.0",
         "friendsofphp/php-cs-fixer": "^2.2",
-        "sebastian/comparator": ">=1.2.3",
-        "symfony/var-dumper": "^3.0|^4.0|^5.0"
+        "scrutinizer/ocular": "^1.3",
+        "symfony/var-dumper": "^3.4|^4.4|^5.1"
     },
     "autoload" : {
         "psr-4" : {

phpunit.xml.dist

@@ -20,8 +20,10 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <whitelist>
-        <directory>src</directory>
-    </whitelist>
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+        </whitelist>
+    </filter>
 </phpunit>
 

src/SourceAdapter/XMLAdapter.php

@@ -65,18 +65,15 @@ protected function collectMetadata(\DOMDocument $dom, $source)
     protected function createDom($source)
     {
         $internalErrors = libxml_use_internal_errors(true);
-        $disableEntities = libxml_disable_entity_loader(true);
         libxml_clear_errors();
 
         $dom = new \DOMDocument('1.0', 'UTF-8');
         if ('' !== trim($source) && !$dom->loadXML($source, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
-            libxml_disable_entity_loader($disableEntities);
 
             throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors)));
         }
 
         libxml_use_internal_errors($internalErrors);
-        libxml_disable_entity_loader($disableEntities);
 
         return $dom;
     }

tests/Tests/ContextAwareEscapingTest.php

@@ -5,6 +5,7 @@
 use Goetas\Twital\SourceAdapter\XHTMLAdapter;
 use Goetas\Twital\SourceAdapter\XMLAdapter;
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 
 class ContextAwareEscapingTest extends TestCase
 {
@@ -13,7 +14,7 @@ class ContextAwareEscapingTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->twital = new Twital();
     }

tests/Tests/CoreAttributeTest.php

@@ -3,13 +3,14 @@
 
 use Goetas\Twital\SourceAdapter\XMLAdapter;
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 
 class CoreAttributeTest extends TestCase
 {
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->twital = new Twital();

tests/Tests/CoreNodesTest.php

@@ -2,6 +2,7 @@
 namespace Goetas\Twital\Tests;
 
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 
 abstract class CoreNodesTest extends TestCase
 {
@@ -10,7 +11,7 @@ abstract class CoreNodesTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->twital = new Twital();

tests/Tests/DynamicAttrAttributeTest.php

@@ -3,6 +3,7 @@
 
 use Goetas\Twital\SourceAdapter\XMLAdapter;
 use Goetas\Twital\TwitalLoader;
+use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
 
@@ -21,7 +22,7 @@ class DynamicAttrAttributeTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -120,10 +121,10 @@ public function getInvalidData()
 
     /**
      * @dataProvider getInvalidData
-     * @expectedException \Exception
      */
     public function testInvalidVisitAttribute($source)
     {
+        $this->expectException(\Exception::class);
         $this->loader->setTemplate('template', $source);
         $this->twig->render('template');
     }

tests/Tests/Event/SourceEventTest.php

@@ -2,8 +2,8 @@
 namespace Goetas\Twital\Tests\Event;
 
 use Goetas\Twital\EventDispatcher\SourceEvent;
-use Goetas\Twital\Tests\TestCase;
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 
 class SourceEventTest extends TestCase
 {
@@ -12,7 +12,7 @@ class SourceEventTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->twital = new Twital();

tests/Tests/Event/TemplateEventTest.php

@@ -3,8 +3,8 @@
 
 use Goetas\Twital\EventDispatcher\TemplateEvent;
 use Goetas\Twital\Template;
-use Goetas\Twital\Tests\TestCase;
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 
 class TemplateEventTest extends TestCase
 {
@@ -14,7 +14,7 @@ class TemplateEventTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->twital = new Twital();

tests/Tests/ExpressionParserTest.php

@@ -2,6 +2,7 @@
 namespace Goetas\Twital\Tests;
 
 use Goetas\Twital\Helper\ParserHelper;
+use PHPUnit\Framework\TestCase;
 
 class ExpressionParserTest extends TestCase
 {
@@ -25,11 +26,11 @@ public function testExpressionsWithLimit($expression, $splitter, $limit, $expect
 
     /**
      * @dataProvider getWrongData
-     * @expectedException Exception
      */
     public function testWrongExpressions($expression)
     {
-        $splitted = ParserHelper::staticSplitExpression($expression, "x");
+        $this->expectException(\Exception::class);
+        ParserHelper::staticSplitExpression($expression, "x");
     }
 
     public function getWrongData()

tests/Tests/FullCompatibilityTwigTest.php

@@ -8,6 +8,7 @@
 use Goetas\Twital\Extension\FullCompatibilityTwigExtension;
 use Goetas\Twital\SourceAdapter\HTML5Adapter;
 use Goetas\Twital\Twital;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class FullCompatibilityTwigTest extends TestCase
@@ -18,7 +19,7 @@ class FullCompatibilityTwigTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->templateSubscriber = new DebugTemplateSubscriber();
 

tests/Tests/Html5DynamicAttrAttributeTest.php

@@ -3,6 +3,7 @@
 
 use Goetas\Twital\SourceAdapter\HTML5Adapter;
 use Goetas\Twital\TwitalLoader;
+use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
 
@@ -21,7 +22,7 @@ class Html5DynamicAttrAttributeTest extends TestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/Tests/TwitalLoaderTest.php

@@ -4,6 +4,7 @@
 use Goetas\Twital\SourceAdapter\XMLAdapter;
 use Goetas\Twital\Twital;
 use Goetas\Twital\TwitalLoader;
+use PHPUnit\Framework\TestCase;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Loader\ArrayLoader;