[+]: update phpunit

voku · Jun 9, 2022 · 2fb4181 · 2fb4181
1 parent 777f3b6
commit 2fb4181
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 #trim_trailing_whitespace = true

diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ composer.lock
 
 # php (phpunit)
 build/
+.phpunit.result.cache
 
 # php (phpcs fixer)
 .php_cs.cache

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     "ext-dom": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "~6.0 || ~7.0"
+    "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/tests/HtmlMinTest.php b/tests/HtmlMinTest.php
@@ -16,9 +16,9 @@ final class HtmlMinTest extends \PHPUnit\Framework\TestCase
 
     public function testEmptyResult()
     {
-        static::assertSame('', $this->compressor->minify(null));
-        static::assertSame('', $this->compressor->minify(' '));
-        static::assertSame('', $this->compressor->minify(''));
+        static::assertSame('', (new HtmlMin())->minify(null));
+        static::assertSame('', (new HtmlMin())->minify(' '));
+        static::assertSame('', (new HtmlMin())->minify(''));
     }
 
     /**
@@ -200,45 +200,36 @@ public function providerTrim(): array
             ],
         ];
     }
-
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->compressor = new HtmlMin();
-    }
-
-    protected function tearDown()
-    {
-        $this->compressor = null;
-    }
-
+
     /**
      * @dataProvider providerBoolAttr
      *
      * @param $input
      */
     public function testBoolAttr($input)
     {
+        $minifier = new HtmlMin();
+
         $html = '<!doctype html><html><body><form>' . $input . '</form></body></html>';
         $expected = '<!DOCTYPE html><html><body><form><input autofocus checked type=checkbox></form>';
 
-        $actual = $this->compressor->minify($html);
+        $actual = $minifier->minify($html);
         static::assertSame($expected, $actual);
 
         // ---
 
         $html = '<html><body><form>' . $input . '</form></body></html>';
         $expected = '<html><body><form><input autofocus checked type=checkbox></form>';
 
-        $actual = $this->compressor->minify($html);
+        $actual = $minifier->minify($html);
         static::assertSame($expected, $actual);
 
         // ---
 
         $html = '<form>' . $input . '</form>';
         $expected = '<form><input autofocus checked type=checkbox></form>';
 
-        $actual = $this->compressor->minify($html);
+        $actual = $minifier->minify($html);
         static::assertSame($expected, $actual);
     }
 
@@ -1388,7 +1379,7 @@ public function testForBrokenHtml()
      */
     public function testMultipleSpaces($input, $expected)
     {
-        $actual = $this->compressor->minify($input);
+        $actual = (new HtmlMin())->minify($input);
         static::assertSame($expected, $actual);
     }
 
@@ -1400,7 +1391,7 @@ public function testMultipleSpaces($input, $expected)
      */
     public function testNewLinesTabsReturns($input, $expected)
     {
-        $actual = $this->compressor->minify($input);
+        $actual = (new HtmlMin())->minify($input);
         static::assertSame($expected, $actual);
     }
 
@@ -1412,7 +1403,7 @@ public function testNewLinesTabsReturns($input, $expected)
      */
     public function testSpaceAfterGt($input, $expected)
     {
-        $actual = $this->compressor->minify($input);
+        $actual = (new HtmlMin())->minify($input);
         static::assertSame($expected, $actual);
     }
 
@@ -1424,7 +1415,7 @@ public function testSpaceAfterGt($input, $expected)
      */
     public function testSpaceBeforeLt($input, $expected)
     {
-        $actual = $this->compressor->minify($input);
+        $actual = (new HtmlMin())->minify($input);
         static::assertSame($expected, $actual, 'tested: ' . $input);
     }
 
@@ -1436,7 +1427,7 @@ public function testSpaceBeforeLt($input, $expected)
      */
     public function testSpecialCharacterEncoding($input, $expected)
     {
-        $actual = $this->compressor->minify($input, true);
+        $actual = (new HtmlMin())->minify($input, true);
         static::assertSame($expected, $actual);
     }
 
@@ -1448,13 +1439,15 @@ public function testSpecialCharacterEncoding($input, $expected)
      */
     public function testTrim($input, $expected)
     {
-        $actual = $this->compressor->minify($input);
+        $actual = (new HtmlMin())->minify($input);
         static::assertSame($expected, $actual);
     }
 
     public function testDoRemoveCommentsWithFalse()
     {
-        $this->compressor->doRemoveComments(false);
+        $minifier = new HtmlMin();
+
+        $minifier->doRemoveComments(false);
 
         $html = <<<'HTML'
 <!DOCTYPE html>
@@ -1473,7 +1466,7 @@ public function testDoRemoveCommentsWithFalse()
 
 HTML;
 
-        $actual = $this->compressor->minify($html);
+        $actual = $minifier->minify($html);
 
         $expectedHtml = <<<'HTML'
 <!DOCTYPE html><html><head><title>Test</title> <body><!-- do not remove comment --> <hr> <!--