diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index cc7afff..836d40e 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -13,28 +13,29 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['7.4']
+ php: ['8.2']
setup: ['stable']
name: PHP
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
tools: composer:v2
+ coverage: pcov
- name: Cache Composer packages
id: composer-cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: vendor
- key: ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+ key: ${{ runner.os }}-${{ matrix.setup }}-coverage-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
- ${{ runner.os }}-${{ matrix.setup }}-php-${{ matrix.php }}-
+ ${{ runner.os }}-${{ matrix.setup }}-coverage-${{ matrix.php }}-
- name: Code Climate Test Reporter Preparation
run: |
@@ -48,12 +49,16 @@ jobs:
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
composer config version 1.9.0
- ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^8.5.26 phpunit/php-file-iterator:^2.0.5 --no-interaction;' || '' }}
- composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }}
+ ${{ matrix.php >= 8 && matrix.php < 8.2 && 'composer require --no-update phpunit/phpunit:^8.5.33 phpunit/php-file-iterator:^2.0.5 --dev --no-interaction;' || '' }}
+ ${{ matrix.php >= 8.2 && 'composer require --no-update phpunit/phpunit:^9.6.12 phpunit/php-file-iterator:^3.0.6 --dev --dev --no-interaction;' || '' }}
+ composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress
- name: Run test suite
run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
+ - name: Coverage
+ uses: codecov/codecov-action@v3
+
- name: Code Climate Test Reporter
if: ${{ env.CC_TEST_REPORTER_ID != '' }}
run: |
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ef22cb4..4e833b0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+ php: ['5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
setup: ['lowest', 'stable', 'next']
name: PHP ${{ matrix.php }} - ${{ matrix.setup }}
@@ -40,8 +40,8 @@ jobs:
if: steps.composer-cache.outputs.cache-hit != 'true'
run: |
composer config version 1.9.0
- ${{ matrix.php >= 7.2 && matrix.php < 8 && matrix.setup == 'lowest' && 'composer require --no-update "phpunit/phpunit:^5.7.27||^6.5.14||^7.5.20" --no-interaction;' || '' }}
- ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^8.5.26 phpunit/php-file-iterator:^2.0.5 phug/phug:^1.9.0 --no-interaction;' || '' }}
+ ${{ matrix.php >= 7.2 && matrix.php < 8 && matrix.setup == 'lowest' && 'composer require --no-update "phpunit/phpunit:^5.7.27||^6.5.14||^7.5.20" --dev --no-interaction;' || '' }}
+ ${{ matrix.php >= 8 && 'composer require --no-update phpunit/phpunit:^8.5.33 phpunit/php-file-iterator:^2.0.5 --dev --no-interaction && composer require --no-update phug/phug:^1.9.0 --no-interaction;' || '' }}
composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }} --no-interaction
env:
MULTI_TESTER_LABELS: install
diff --git a/composer.json b/composer.json
index f7556ce..c513d1f 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
}
},
"require-dev": {
- "phpunit/phpunit": ">=4.8.35 <9.0"
+ "phpunit/phpunit": ">=4.8.35 <10.0"
},
"bin": ["pug"],
"autoload": {
diff --git a/example/bootstrap.php b/example/bootstrap.php
index 9a0b4a2..a2277d6 100644
--- a/example/bootstrap.php
+++ b/example/bootstrap.php
@@ -3,7 +3,11 @@
namespace Pug;
include_once __DIR__ . '/../vendor/autoload.php';
-error_reporting(E_ALL);
+error_reporting(
+ PHP_VERSION >= 8.2 && !property_exists(Lexer::class, 'disallow')
+ ? (E_ALL & ~E_DEPRECATED)
+ : E_ALL
+);
ini_set('display_errors', 1);
class Application
diff --git a/phpunit.xml b/phpunit.xml
index 16d4ec0..4c36435 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -29,10 +29,6 @@
tests/features/facade.php
-
- tests/nodes
- tests/compiler
-
tests/performance
diff --git a/tests/features/issues.php b/tests/features/issues.php
index 18ad87a..9996081 100644
--- a/tests/features/issues.php
+++ b/tests/features/issues.php
@@ -139,7 +139,10 @@ public function testIssue90()
data-b="$test"
data-c=\'#{$test}\'
data-d="#{$test}"
- data-e="#${test}"
+ data-e="#' . (PHP_VERSION >= 8.2
+ ? '{$test}' // Dropping ${test} support with PHP >= 8.2
+ : '${test}'
+ ) . '"
) test', array(
'test' => 'foo',
))));
diff --git a/tests/lib/bootstrap.php b/tests/lib/bootstrap.php
index de08cc7..cbb1a37 100644
--- a/tests/lib/bootstrap.php
+++ b/tests/lib/bootstrap.php
@@ -1,5 +1,6 @@
= 8.2 && !property_exists(Lexer::class, 'disallow')
+ ? (E_ALL & ~E_DEPRECATED)
+ : E_ALL
+ );
setup_autoload();
}