- Added compatibility with PHPUnit 9.0

.gitignore

@@ -12,8 +12,10 @@
 
 # PhpUnit
 /build/
+/.phpunit.result.cache
 
 # Composer
 /bin/
 /vendor/
-/composer.lock
+/composer.lock
+/composer.phar

composer.json

@@ -19,7 +19,7 @@
         "tecnickcom/tcpdf": "^6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "^5.0 || ^9.0"
     },
     "suggest": {
         "fagundes/zff-html2pdf": "if you need to integrate Html2Pdf with Zend Framework 2 (zf2)",

phpunit.xml

@@ -1,7 +1,9 @@
 <?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="./vendor/autoload.php" colors="true" backupGlobals="false"
+     bootstrap="./src/Tests/bootstrap.php"
+     colors="true"
+     backupGlobals="false"
      backupStaticAttributes="false"
      verbose="true"
 >

src/Tests/AbstractTest.php

@@ -4,34 +4,17 @@
 
 use Spipu\Html2Pdf\Html2Pdf;
 
+if (HTML2PDF_PHPUNIT_VERSION === 9) {
+    require_once 'CrossVersionCompatibility/PhpUnit9/AbstractTestCase.php';
+} else {
+    require_once 'CrossVersionCompatibility/PhpUnit5/AbstractTestCase.php';
+}
+
 /**
- * Class Html2PdfTest
+ * Class AbstractTest
  */
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractTest extends \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\AbstractTestCase
 {
-    /**
-     * @var Html2Pdf
-     */
-    private $html2pdf;
-
-    /**
-     * Executed before each test
-     */
-    protected function setUp()
-    {
-        $this->html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', [0, 0, 0, 0]);
-        $this->html2pdf->pdf->SetTitle('PhpUnit Test');
-    }
-
-    /**
-     * Executed after each test
-     */
-    protected function tearDown()
-    {
-        $this->html2pdf->clean();
-        $this->html2pdf = null;
-    }
-
     /**
      * Get the object to test
      *

src/Tests/CrossVersionCompatibility/PhpUnit5/AbstractTestCase.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+use Spipu\Html2Pdf\Html2Pdf;
+
+abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Html2Pdf
+     */
+    protected $html2pdf;
+
+    /**
+     * Executed before each test
+     */
+    protected function setUp()
+    {
+        $this->html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', [0, 0, 0, 0]);
+        $this->html2pdf->pdf->SetTitle('PhpUnit Test');
+    }
+
+    /**
+     * Executed after each test
+     */
+    protected function tearDown()
+    {
+        $this->html2pdf->clean();
+        $this->html2pdf = null;
+    }
+
+    public function expectException($exception)
+    {
+        if (method_exists(\PHPUnit_Framework_TestCase::class, 'setExpectedException')) {
+            $this->setExpectedException($exception);
+        }
+    }
+
+    public function expectExceptionMessage($message, $exception = null)
+    {
+        if (method_exists(\PHPUnit_Framework_TestCase::class, 'expectExceptionMessage')) {
+            parent::expectExceptionMessage($message);
+        } elseif (method_exists(\PHPUnit_Framework_TestCase::class, 'setExpectedException')) {
+            $this->setExpectedException($exception, $message);
+        }
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit5/CssConverterTestCase.php

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

src/Tests/CrossVersionCompatibility/PhpUnit5/ExceptionFormatterTestCase.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Html2Pdf Library - Tests
+ *
+ * HTML => PDF converter
+ * distributed under the OSL-3.0 License
+ *
+ * @package   Html2pdf
+ * @author    Laurent MINGUET <[email protected]>
+ * @copyright 2017 Laurent MINGUET
+ */
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+abstract class ExceptionFormatterTestCase extends \PHPUnit_Framework_TestCase
+{
+}

src/Tests/CrossVersionCompatibility/PhpUnit5/HtmlTestCase.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Html2Pdf Library - Tests
+ *
+ * HTML => PDF converter
+ * distributed under the OSL-3.0 License
+ *
+ * @package   Html2pdf
+ * @author    Laurent MINGUET <[email protected]>
+ * @copyright 2017 Laurent MINGUET
+ */
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+use Spipu\Html2Pdf\Parsing\Html;
+
+abstract class HtmlTestCase extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Html
+     */
+    protected $object;
+
+    protected function setUp()
+    {
+        $textParser = $this->getMockBuilder('Spipu\Html2Pdf\Parsing\TextParser')
+            ->disableOriginalConstructor()
+            ->setMethods(['prepareTxt'])
+            ->getMock();
+
+        $textParser
+            ->expects($this->any())
+            ->method('prepareTxt')
+            ->will($this->returnCallback([$this, 'mockPrepareTxt']));
+
+        $this->object = new Html($textParser);
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit5/SvgDrawerTestCase.php

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

src/Tests/CrossVersionCompatibility/PhpUnit5/TagParserTestCase.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Html2Pdf Library - Tests
+ *
+ * HTML => PDF converter
+ * distributed under the OSL-3.0 License
+ *
+ * @package   Html2pdf
+ * @author    Laurent MINGUET <[email protected]>
+ * @copyright 2017 Laurent MINGUET
+ */
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+use Spipu\Html2Pdf\Parsing\Node;
+use Spipu\Html2Pdf\Parsing\TagParser;
+
+abstract class TagParserTestCase extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var TagParser
+     */
+    protected $parser;
+
+    protected function setUp()
+    {
+        $textParser = $this->getMockBuilder('Spipu\Html2Pdf\Parsing\TextParser')
+            ->disableOriginalConstructor()
+            ->setMethods(['prepareTxt'])
+            ->getMock();
+
+        $textParser
+            ->expects($this->any())
+            ->method('prepareTxt')
+            ->will($this->returnCallback([$this, 'mockPrepareTxt']));
+
+        $this->parser = new TagParser($textParser);
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit5/TextParserTestCase.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Html2Pdf Library - Tests
+ *
+ * HTML => PDF converter
+ * distributed under the OSL-3.0 License
+ *
+ * @package   Html2pdf
+ * @author    Laurent MINGUET <[email protected]>
+ * @copyright 2017 Laurent MINGUET
+ */
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+use Spipu\Html2Pdf\Parsing\TextParser;
+
+abstract class TextParserTestCase extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var TextParser
+     */
+    protected $parser;
+
+    protected function setUp()
+    {
+        $this->parser = new TextParser();
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit9/AbstractTestCase.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+use Spipu\Html2Pdf\Html2Pdf;
+
+abstract class AbstractTestCase extends \PHPUnit\Framework\TestCase
+{
+    use \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\AssertContains;
+
+    /**
+     * @var Html2Pdf
+     */
+    protected $html2pdf;
+
+    /**
+     * Executed before each test
+     */
+    protected function setUp(): void
+    {
+        $this->html2pdf = new Html2Pdf('P', 'A4', 'fr', true, 'UTF-8', [0, 0, 0, 0]);
+        $this->html2pdf->pdf->SetTitle('PhpUnit Test');
+    }
+
+    /**
+     * Executed after each test
+     */
+    protected function tearDown(): void
+    {
+        $this->html2pdf->clean();
+        $this->html2pdf = null;
+    }
+
+    public function expectExceptionMessage($message, $exception = null): void
+    {
+        // Yes, we ignore $exception
+        parent::expectExceptionMessage($message);
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit9/AssertContains.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9;
+
+trait AssertContains
+{
+    public static function assertContains($needle, $haystack, string $message = ''): void
+    {
+        if (is_string($haystack)) {
+            parent::assertStringContainsString($needle, $haystack, $message);
+        } else {
+            parent::assertContains($needle, $haystack, $message);
+        }
+    }
+}

src/Tests/CrossVersionCompatibility/PhpUnit9/CssConverterTestCase.php

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

src/Tests/CrossVersionCompatibility/PhpUnit9/ExceptionFormatterTestCase.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Html2Pdf Library - Tests
+ *
+ * HTML => PDF converter
+ * distributed under the OSL-3.0 License
+ *
+ * @package   Html2pdf
+ * @author    Laurent MINGUET <[email protected]>
+ * @copyright 2017 Laurent MINGUET
+ */
+
+namespace Spipu\Html2Pdf\Tests\CrossVersionCompatibility;
+
+abstract class ExceptionFormatterTestCase extends \PHPUnit\Framework\TestCase
+{
+    use \Spipu\Html2Pdf\Tests\CrossVersionCompatibility\PhpUnit9\AssertContains;
+}