better unit tests

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [5.2.7](https://github.com/spipu/html2pdf/compare/v5.2.6...v5.2.7) - 2023-02-02
+
+* fix phunit compatibility
+
 ## [5.2.6](https://github.com/spipu/html2pdf/compare/v5.2.5...v5.2.6) - 2023-01-28
 
   * add support of PHP 8.1 and PHP 8.2

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-     bootstrap="./src/Tests/bootstrap.php"
+     bootstrap="./src/Tests/CrossVersionCompatibility/bootstrap.php"
      colors="true"
      backupGlobals="false"
      backupStaticAttributes="false"

src/Html2Pdf.php

@@ -247,7 +247,7 @@ public function getVersionAsArray()
         return array(
             'major'     => 5,
             'minor'     => 2,
-            'revision'  => 6
+            'revision'  => 7
         );
     }
 

src/Tests/AbstractTest.php

@@ -3,17 +3,12 @@
 namespace Spipu\Html2Pdf\Tests;
 
 use Spipu\Html2Pdf\Html2Pdf;
-
-if (HTML2PDF_PHPUNIT_VERSION === 9) {
-    require_once 'CrossVersionCompatibility/PhpUnit9/AbstractTestCase.php';
-} else {
-    require_once 'CrossVersionCompatibility/PhpUnit5/AbstractTestCase.php';
-}
+use Spipu\Html2Pdf\Tests\CrossVersionCompatibility\AbstractTestCase;
 
 /**
  * Class AbstractTest
  */
-abstract class AbstractTest extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\AbstractTestCase
+abstract class AbstractTest extends AbstractTestCase
 {
     /**
      * Get the object to test

src/Tests/CrossVersionCompatibility/AbstractTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class AbstractTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\AbstractTestCase
+    {
+    }
+} else {
+    abstract class AbstractTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\AbstractTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/CssConverterTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class CssConverterTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\CssConverterTestCase
+    {
+    }
+} else {
+    abstract class CssConverterTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\CssConverterTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/ExceptionFormatterTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class ExceptionFormatterTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\ExceptionFormatterTestCase
+    {
+    }
+} else {
+    abstract class ExceptionFormatterTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\ExceptionFormatterTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/HtmlTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class HtmlTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\HtmlTestCase
+    {
+    }
+} else {
+    abstract class HtmlTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\HtmlTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit5/AbstractTestCase.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
 use Spipu\Html2Pdf\Html2Pdf;
 

src/Tests/CrossVersionCompatibility/PhpUnit5/CssConverterTestCase.php

@@ -1,17 +1,18 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
+use PHPUnit_Framework_TestCase;
 use Spipu\Html2Pdf\CssConverter;
 
-abstract class CssConverterTestCase extends \PHPUnit_Framework_TestCase
+abstract class CssConverterTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var CssConverter
      */
     protected $cssConverter;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->cssConverter = new CssConverter();
     }

src/Tests/CrossVersionCompatibility/PhpUnit5/ExceptionFormatterTestCase.php

@@ -10,8 +10,10 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
-abstract class ExceptionFormatterTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit_Framework_TestCase;
+
+abstract class ExceptionFormatterTestCase extends PHPUnit_Framework_TestCase
 {
 }

src/Tests/CrossVersionCompatibility/PhpUnit5/HtmlTestCase.php

@@ -10,11 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
+use PHPUnit_Framework_TestCase;
 use Spipu\Html2Pdf\Parsing\Html;
 
-abstract class HtmlTestCase extends \PHPUnit_Framework_TestCase
+abstract class HtmlTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var Html

src/Tests/CrossVersionCompatibility/PhpUnit5/SvgDrawerTestCase.php

@@ -1,18 +1,19 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
+use PHPUnit_Framework_TestCase;
 use Spipu\Html2Pdf\CssConverter;
 use Spipu\Html2Pdf\SvgDrawer;
 
-abstract class SvgDrawerTestCase extends \PHPUnit_Framework_TestCase
+abstract class SvgDrawerTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var SvgDrawer
      */
     protected $svgDrawer;
 
-    public function setUp()
+    protected function setUp()
     {
         $myPdf = $this->createMock('Spipu\Html2Pdf\MyPdf');
 

src/Tests/CrossVersionCompatibility/PhpUnit5/TagParserTestCase.php

@@ -10,12 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
-use Spipu\Html2Pdf\Parsing\Node;
+use PHPUnit_Framework_TestCase;
 use Spipu\Html2Pdf\Parsing\TagParser;
 
-abstract class TagParserTestCase extends \PHPUnit_Framework_TestCase
+abstract class TagParserTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var TagParser

src/Tests/CrossVersionCompatibility/PhpUnit5/TextParserTestCase.php

@@ -10,11 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5;
 
+use PHPUnit_Framework_TestCase;
 use Spipu\Html2Pdf\Parsing\TextParser;
 
-abstract class TextParserTestCase extends \PHPUnit_Framework_TestCase
+abstract class TextParserTestCase extends PHPUnit_Framework_TestCase
 {
     /**
      * @var TextParser

src/Tests/CrossVersionCompatibility/PhpUnit9/AbstractTestCase.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\Html2Pdf;
 
-abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
+abstract class AbstractTestCase extends TestCase
 {
-    use \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\AssertContains;
+    use AssertContains;
 
     /**
      * @var Html2Pdf

src/Tests/CrossVersionCompatibility/PhpUnit9/CssConverterTestCase.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\CssConverter;
 
-abstract class CssConverterTestCase extends \PHPUnit\Framework\TestCase
+abstract class CssConverterTestCase extends TestCase
 {
     /**
      * @var CssConverter

src/Tests/CrossVersionCompatibility/PhpUnit9/ExceptionFormatterTestCase.php

@@ -10,9 +10,11 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
-abstract class ExceptionFormatterTestCase extends \PHPUnit\Framework\TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class ExceptionFormatterTestCase extends TestCase
 {
-    use \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\AssertContains;
+    use AssertContains;
 }

src/Tests/CrossVersionCompatibility/PhpUnit9/HtmlTestCase.php

@@ -10,11 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\Parsing\Html;
 
-abstract class HtmlTestCase extends \PHPUnit\Framework\TestCase
+abstract class HtmlTestCase extends TestCase
 {
     /**
      * @var Html

src/Tests/CrossVersionCompatibility/PhpUnit9/SvgDrawerTestCase.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\CssConverter;
 use Spipu\Html2Pdf\SvgDrawer;
 
-abstract class SvgDrawerTestCase extends \PHPUnit\Framework\TestCase
+abstract class SvgDrawerTestCase extends TestCase
 {
     /**
      * @var SvgDrawer

src/Tests/CrossVersionCompatibility/PhpUnit9/TagParserTestCase.php

@@ -10,11 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\Parsing\TagParser;
 
-abstract class TagParserTestCase extends \PHPUnit\Framework\TestCase
+abstract class TagParserTestCase extends TestCase
 {
     /**
      * @var TagParser

src/Tests/CrossVersionCompatibility/PhpUnit9/TextParserTestCase.php

@@ -10,11 +10,12 @@
  * @copyright 2017 Laurent MINGUET
  */
 
-namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
 
+use PHPUnit\Framework\TestCase;
 use Spipu\Html2Pdf\Parsing\TextParser;
 
-abstract class TextParserTestCase extends \PHPUnit\Framework\TestCase
+abstract class TextParserTestCase extends TestCase
 {
     /**
      * @var TextParser

src/Tests/CrossVersionCompatibility/SvgDrawerTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class SvgDrawerTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\SvgDrawerTestCase
+    {
+    }
+} else {
+    abstract class SvgDrawerTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\SvgDrawerTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/TagParserTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class TagParserTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\TagParserTestCase
+    {
+    }
+} else {
+    abstract class TagParserTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\TagParserTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/TextParserTestCase.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    abstract class TextParserTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\TextParserTestCase
+    {
+    }
+} else {
+    abstract class TextParserTestCase extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit5\TextParserTestCase
+    {
+    }
+}

src/Tests/CrossVersionCompatibility/bootstrap.php

@@ -0,0 +1,13 @@
+<?php
+
+require_once __DIR__ . '/../../../vendor/autoload.php';
+
+if (!class_exists('PHPUnit_Framework_TestCase') && version_compare(phpversion(), '7.1') >= 0) {
+    class PHPUnit_Framework_TestCase extends PHPUnit\Framework\TestCase
+    {
+    }
+
+    define('HTML2PDF_PHPUNIT_VERSION', 9);
+} else {
+    define('HTML2PDF_PHPUNIT_VERSION', 5);
+}