Skip to content

Commit 2a29db6

Browse files
authored
Merge pull request #951 from cakephp/5.x-phpunit10
5.x: upgrade to PHPUnit 10
2 parents b5c48ff + 913dbe4 commit 2a29db6

3 files changed

Lines changed: 17 additions & 16 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Thumbs.db
2222
# Tool specific files #
2323
#######################
2424
# PHPUnit
25-
.phpunit.result.cache
25+
.phpunit.cache
2626
tests.sqlite
2727
# vim
2828
*~

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"cakephp/cakephp-codesniffer": "^5.0",
1717
"cakephp/debug_kit": "5.x-dev",
1818
"josegonzalez/dotenv": "^3.2",
19-
"phpunit/phpunit": "^9.6"
19+
"phpunit/phpunit": "^10.1.0"
2020
},
2121
"suggest": {
2222
"markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",

phpunit.xml.dist

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
colors="true"
4-
processIsolation="false"
5-
stopOnFailure="false"
6-
bootstrap="tests/bootstrap.php"
7-
>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
colors="true"
4+
processIsolation="false"
5+
stopOnFailure="false"
6+
bootstrap="tests/bootstrap.php"
7+
cacheDirectory=".phpunit.cache"
8+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd">
89
<php>
910
<ini name="memory_limit" value="-1"/>
1011
<ini name="apc.enable_cli" value="1"/>
@@ -20,17 +21,17 @@
2021

2122
<!-- Load extension for fixtures -->
2223
<extensions>
23-
<extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
24+
<bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/>
2425
</extensions>
2526

2627
<!-- Ignore vendor tests in code coverage reports -->
27-
<filter>
28-
<whitelist>
28+
<source>
29+
<include>
2930
<directory suffix=".php">src/</directory>
3031
<directory suffix=".php">plugins/*/src/</directory>
31-
<exclude>
32-
<file>src/Console/Installer.php</file>
33-
</exclude>
34-
</whitelist>
35-
</filter>
32+
</include>
33+
<exclude>
34+
<file>src/Console/Installer.php</file>
35+
</exclude>
36+
</source>
3637
</phpunit>

0 commit comments

Comments
 (0)