Polyfill PHPUnit methods not available in old versions

.codeclimate.yml

@@ -37,5 +37,7 @@ plugins:
     enabled: true
     exclude_patterns:
       - "src/Phug/Phug/Phug/Optimizer.php"
+      - "src/Phug/Util/CompatibilityUtil/TestCaseTyped.php"
+      - "src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php"
 exclude_patterns:
   - "**/tests/**"

.github/workflows/coverage.yml

@@ -25,7 +25,7 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
-        ini-values: memory_limit=-1, zend.enable_gc=0, xdebug.mode=coverage
+        ini-values: memory_limit=-1, zend.enable_gc=0, xdebug.mode="coverage,develop"
         tools: composer:v2
         extensions: pcntl
         coverage: xdebug

.github/workflows/tests.yml

@@ -33,9 +33,9 @@ jobs:
       uses: actions/cache@v2
       with:
         path: vendor
-        key: ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-${{ matrix.setup }}-v2-php-${{ matrix.php }}-
+          ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

.multi-tester.yml

@@ -45,7 +45,7 @@ bkwld/laravel-pug:
   source:
     success_only: true
     url: https://github.com/BKWLD/laravel-pug.git
-    reference: multi-tester-labels
+    reference: master
   install: github
   script: github
 

composer.json

@@ -29,14 +29,13 @@
     "require-dev": {
         "cebe/markdown": "^1.1",
         "js-phpize/js-phpize-phug": "^1.2 || ^2.2.1",
-        "kylekatarnls/multi-tester": "^2.5.2",
         "nodejs-php-fallback/coffeescript": "^1.0.1",
         "nodejs-php-fallback/less": "^1.0.5",
         "nodejs-php-fallback/stylus": "^1.0.4",
         "nodejs-php-fallback/uglify": "^1.0.4",
-        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.34 || ^9.6.13",
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^8.5.34 || ^9.6.13",
         "phpunit/php-code-coverage": "^2.2.4 || ^4.0.8 || ^5.3.2 || ^6.1.4 || ^7.0.15 || ^9.2.28",
-        "phpunit/php-invoker": "^3.1.1",
+        "phpunit/php-invoker": "^1.1.4 || ^3.1.1",
         "pug-php/pug": "^2.7.3 || ^3.4.1",
         "pug-php/pug-filter-coffee-script": "^1.3.1",
         "squizlabs/php_codesniffer": "^3.7.2"

src/Phug/Util/CompatibilityUtil/TestCaseTyped.php

@@ -30,5 +30,38 @@ protected function tearDown(): void
     {
         $this->finishTest();
     }
+
+    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist(string $filename, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
 }
 // @codeCoverageIgnoreEnd

src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php

@@ -30,5 +30,38 @@ protected function tearDown()
     {
         $this->finishTest();
     }
+
+    public static function assertMatchesRegularExpression($pattern, $string, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist($filename, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
 }
 // @codeCoverageIgnoreEnd

tests/Phug/Adapter/FileAdapterTest.php

@@ -583,6 +583,8 @@ public function testCacheRenderString()
      */
     public function testMissingDirectory()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $renderer = new Renderer([
             'exit_on_error' => false,
             'cache_dir'     => '///cannot/be/created',

tests/Phug/CliTest.php

@@ -224,7 +224,7 @@ public function testCacheDirectory()
         ob_end_clean();
 
         self::assertFileExists($expected);
-        self::assertFileNotExists("$expected/junk");
+        self::assertFileDoesNotExist("$expected/junk");
 
         $registryFile = "$expected/registry.php";
 
@@ -259,7 +259,7 @@ public function testCacheDirectory()
 
         $this->removeFile($expected);
 
-        self::assertRegExp('/Inconsistent indentation./', $text);
+        self::assertMatchesRegularExpression('/Inconsistent indentation./', $text);
     }
 
     /**
@@ -328,7 +328,7 @@ public function testCacheDirectoryWithViewsDirInOptions()
         ob_end_clean();
 
         self::assertFileExists($expected);
-        self::assertFileNotExists("$expected/junk");
+        self::assertFileDoesNotExist("$expected/junk");
 
         $registryFile = "$expected/registry.php";
 

tests/Phug/DependencyInjectionTest.php

@@ -11,10 +11,13 @@
 use Phug\Test\Utils\ClockInterface;
 use Phug\Util\UnorderedArguments;
 
+/**
+ * @coversDefaultClass \Phug\DependencyInjection
+ */
 class DependencyInjectionTest extends AbstractDependencyInjectionTest
 {
     /**
-     * @covers \Phug\DependencyInjection::<public>
+     * @covers ::<public>
      * @covers \Phug\DependencyInjection\Dependency::<public>
      * @covers \Phug\DependencyInjection\Requirement::<public>
      */
@@ -393,7 +396,6 @@ public function testRecursion()
     }
 
     /**
-     * @covers ::__construct
      * @covers ::register
      * @covers ::provider
      * @covers ::getProvider

tests/Phug/Element/KeywordElementTest.php

@@ -6,6 +6,7 @@
 use Phug\Formatter\Element\AttributeElement;
 use Phug\Formatter\Element\KeywordElement;
 use Phug\Formatter\Element\MarkupElement;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 use Phug\Util\TestCase;
 use SplObjectStorage;
 
@@ -119,6 +120,8 @@ public function testPhpReturn()
      */
     public function testBadReturn()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $keyword = new KeywordElement('foo', 'bar');
         $attributes = new SplObjectStorage();
         $source = new AttributeElement('src', '/foo/bar.png');

tests/Phug/Element/MixinCallElementTest.php

@@ -360,7 +360,7 @@ public function testPhpUnwrap()
         eval('?>'.$php);
         ob_get_clean();
 
-        self::assertRegExp('/echo\s1;\s+\}/', $php);
+        self::assertMatchesRegularExpression('/echo\s1;\s+\}/', $php);
     }
 
     /**

tests/Phug/EventTest.php

@@ -56,7 +56,7 @@ public function testGetSetTarget()
     public function testGetSetParams()
     {
         $event = new Event('test.event');
-        self::assertInternalType('array', $event->getParams());
+        self::assertIsArray($event->getParams());
         self::assertCount(0, $event->getParams(), 'params are empty when not passed');
 
         $params = ['test_key' => 'test value'];

tests/Phug/FormatterTest.php

@@ -300,7 +300,7 @@ public function testFormat()
         $exp = new ExpressionElement('foreach ($tabs as $key => $tab)');
         $code = $formatter->format($exp);
 
-        self::assertRegExp('/as\s\$key\s=>\s\$tab/', $code);
+        self::assertMatchesRegularExpression('/as\s\$key\s=>\s\$tab/', $code);
     }
 
     /**

tests/Phug/Invoker/InvokerTest.php

@@ -7,6 +7,7 @@
 use Phug\Event\ListenerQueue;
 use Phug\Invoker;
 use Phug\Parser\Node\ElementNode;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 use Phug\Util\TestCase;
 use ReflectionException;
 use RuntimeException;
@@ -30,6 +31,8 @@ class InvokerTest extends TestCase
      */
     public function testConstruct()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         new Invoker([
             function ($event) {
             },
@@ -48,6 +51,8 @@ function ($event) {
      */
     public function testAdd()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $invoker = new Invoker([]);
 
         $invoker->add([

tests/Phug/Lexer/Scanner/AssignmentScannerTest.php

@@ -25,6 +25,9 @@ public function testScan()
         self::assertSame('test', $tok->getName());
     }
 
+    /**
+     * @coversNothing
+     */
     public function testScanWithAttributes()
     {
         /** @var AssignmentToken $tok */
@@ -42,6 +45,8 @@ public function testScanWithAttributes()
 
     /**
      * @see https://github.com/phug-php/phug/issues/22
+     *
+     * @coversNothing
      */
     public function testObjectInTernary()
     {

tests/Phug/OptimizerTest.php

@@ -174,7 +174,7 @@ public function testUpToDateCheckCachePath()
         $cachePath = null;
 
         self::assertFalse($optimizer->isExpired('file2', $cachePath));
-        self::assertFileNotExists($cachePath);
+        self::assertFileDoesNotExist($cachePath);
 
         rename(__DIR__.'/file2.pug', __DIR__.'/../views/dir2/file2.pug');
         $options['up_to_date_check'] = true;

tests/Phug/Parser/TokenHandler/AssignmentTokenHandlerTest.php

@@ -14,6 +14,7 @@
 use Phug\Parser\TokenHandler\AttributeEndTokenHandler;
 use Phug\Parser\TokenHandler\AttributeStartTokenHandler;
 use Phug\Parser\TokenHandler\AttributeTokenHandler;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 use Phug\Util\TestCase;
 
 /**
@@ -81,6 +82,8 @@ public function testHandleTokenWithNothingNext()
      */
     public function testHandleTokenTokenException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex('div'));
         $handler = new AssignmentTokenHandler();
@@ -96,6 +99,8 @@ public function testHandleTokenTokenException()
      */
     public function testHandleTokenElementTagsException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex('div'), [
             'token_handlers' => [

tests/Phug/Parser/TokenHandler/AttributeEndTokenHandlerTest.php

@@ -8,6 +8,7 @@
 use Phug\Parser;
 use Phug\Parser\State;
 use Phug\Parser\TokenHandler\AttributeEndTokenHandler;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 use Phug\Util\TestCase;
 
 /**
@@ -37,6 +38,8 @@ public function testHandleToken()
      */
     public function testHandleTokenTokenException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex('div'));
         $handler = new AttributeEndTokenHandler();

tests/Phug/Parser/TokenHandler/BlockTokenHandlerTest.php

@@ -8,6 +8,7 @@
 use Phug\Parser\State;
 use Phug\Parser\TokenHandler\BlockTokenHandler;
 use Phug\Test\AbstractParserTest;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 
 /**
  * @coversDefaultClass \Phug\Parser\TokenHandler\BlockTokenHandler
@@ -34,6 +35,8 @@ public function testHandleToken()
      */
     public function testHandleTokenTokenException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex('div'));
         $handler = new BlockTokenHandler();

tests/Phug/Parser/TokenHandler/CodeTokenHandlerTest.php

@@ -9,6 +9,7 @@
 use Phug\Parser\State;
 use Phug\Parser\TokenHandler\CodeTokenHandler;
 use Phug\Test\AbstractParserTest;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 
 /**
  * @coversDefaultClass \Phug\Parser\TokenHandler\CodeTokenHandler
@@ -105,6 +106,8 @@ public function testHandleCodeValue()
      */
     public function testHandleTokenTokenException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex('div- do_something()'));
         $handler = new CodeTokenHandler();
@@ -121,6 +124,8 @@ public function testHandleTokenTokenException()
      */
     public function testHandleTokenUnexpectedBlock()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $this->parser->parse('div-');
     }
 }

tests/Phug/Parser/TokenHandler/ConditionalTokenHandlerTest.php

@@ -8,6 +8,7 @@
 use Phug\Parser\State;
 use Phug\Parser\TokenHandler\ConditionalTokenHandler;
 use Phug\Test\AbstractParserTest;
+use Phug\Test\Utils\ExceptionAnnotationReader;
 
 /**
  * @coversDefaultClass \Phug\Parser\TokenHandler\ConditionalTokenHandler
@@ -35,6 +36,8 @@ public function testHandleToken()
      */
     public function testHandleTokenTokenException()
     {
+        ExceptionAnnotationReader::read($this, __METHOD__);
+
         $lexer = new Lexer();
         $state = new State(new Parser(), $lexer->lex(''));
         $handler = new ConditionalTokenHandler();