Skip to content

Commit

Permalink
Merge e2b01c3 into 94c611c
Browse files Browse the repository at this point in the history
  • Loading branch information
bkrukowski committed Sep 21, 2023
2 parents 94c611c + e2b01c3 commit 7ea5c4f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
operating-system: ['ubuntu-20.04']
php-versions: ['7.4', '8.0', '8.1', '8.2']
php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3-dev', '8.4-dev']
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -35,6 +35,7 @@ jobs:
php_version: ${{ matrix.php-versions }}

- name: Install dev-tools
if: ${{ !contains(matrix.php-versions, 'dev') }}
uses: php-actions/composer@v6
with:
php_version: ${{ matrix.php-versions }}
Expand All @@ -44,11 +45,13 @@ jobs:
run: vendor/bin/phpunit

- name: Coding Standards Fixer
if: ${{ !contains(matrix.php-versions, 'dev') }}
run: ./dev-tools/vendor/bin/php-cs-fixer --diff --dry-run -v --allow-risky=yes fix && ./dev-tools/vendor/bin/php-cs-fixer --diff --dry-run -v --allow-risky=yes fix .php-cs-fixer.dist.php
env:
PHP_CS_FIXER_IGNORE_ENV: 1

- name: Coverage
if: ${{ !contains(matrix.php-versions, 'dev') }}
run: bin/coveralls.sh
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
'native_constant_invocation' => true,
'array_syntax' => ['syntax' => 'short'],
'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
'static_lambda' => false,
])
->setFinder($finder)
;
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [5.0.7] - ????-??-??

Perform tests against PHP 8.3.0-dev & 8.4.0-dev in GitHub Actions.

## [5.0.6] - 2022-12-14

Perform tests against PHP 8.2 in GitHub Actions.
Expand Down Expand Up @@ -37,6 +41,7 @@ Added test for changing returned value in defer.

The given version is the successor of version [4.0.1].

[5.0.7]: https://github.com/php-defer/php-defer/compare/v5.0.6...v5.0.7
[5.0.6]: https://github.com/php-defer/php-defer/compare/v5.0.5...v5.0.6
[5.0.5]: https://github.com/php-defer/php-defer/compare/v5.0.4...v5.0.5
[5.0.4]: https://github.com/php-defer/php-defer/compare/v5.0.3...v5.0.4
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2019-2022 Bartłomiej Krukowski
Copyright (c) 2019-2023 Bartłomiej Krukowski

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"php-coveralls/php-coveralls": "^2.5.2",
"friendsofphp/php-cs-fixer": "v3.13.0"
"php-coveralls/php-coveralls": "^2.6.0",
"friendsofphp/php-cs-fixer": "v3.27.0"
}
}
4 changes: 1 addition & 3 deletions tests/DeferException.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@
/**
* @internal
*/
final class DeferException extends \Exception
{
}
final class DeferException extends \Exception {}

0 comments on commit 7ea5c4f

Please sign in to comment.