Skip to content

Commit

Permalink
Upgrade PHPUnit 9.0 and adjust CI to ignore PHP 7.2 and add PHP 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
derickr committed Jul 20, 2022
1 parent 35c5253 commit b5942e3
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
# Keys:
# - experimental: Whether the build is "allowed to fail".
matrix:
php: ['7.2', '7.3', '7.4', '8.0']
php: ['7.3', '7.4', '8.0', '8.1']
experimental: [false]

include:
- php: '8.1'
- php: '8.2'
experimental: true

name: "PHP: ${{ matrix.php }}"
Expand All @@ -41,12 +41,12 @@ jobs:

# Install dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-composer-dependencies
- name: "Install Composer dependencies (PHP < 8.1)"
if: ${{ matrix.php < '8.1' }}
- name: "Install Composer dependencies (PHP < 8.2)"
if: ${{ matrix.php < '8.2' }}
uses: "ramsey/composer-install@v1"

- name: "Install Composer dependencies (PHP 8.1)"
if: ${{ matrix.php >= '8.1' }}
- name: "Install Composer dependencies (PHP 8.2)"
if: ${{ matrix.php >= '8.2' }}
uses: "ramsey/composer-install@v1"
with:
composer-options: --ignore-platform-reqs
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"zetacomponents/base": "~1.8"
},
"require-dev": {
"phpunit/phpunit": "~8.0",
"phpunit/phpunit": "~9.0",
"zetacomponents/unit-test": "*"
}
}
25 changes: 12 additions & 13 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="./tests/bootstrap.php" colors="true" beStrictAboutTestsThatDoNotTestAnything="false" cacheResult="false">
<testsuites>
<testsuite name="Zeta Components Mail">
<directory suffix="_test.php">./tests</directory>
<exclude>./tests/transports</exclude>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory>./src</directory>
</whitelist>
</filter>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" beStrictAboutTestsThatDoNotTestAnything="false" cacheResult="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory>./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Zeta Components Mail">
<directory suffix="_test.php">./tests</directory>
<exclude>./tests/transports</exclude>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit b5942e3

Please sign in to comment.