Skip to content

Commit 4542295

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #20404 from MauricioFauth/phpunit-11-config
Migrate PHPUnit configuration to version 11.5
2 parents 28cd377 + da8fa0c commit 4542295

6 files changed

Lines changed: 12 additions & 16 deletions

File tree

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ tests/*-local-server export-ignore
2929
tests/*.conf export-ignore
3030
tests/*.ini export-ignore
3131
tests/ci-phplint export-ignore
32+
tests/bootstrap.php export-ignore
33+
phpunit.xml export-ignore
3234
.browserslistrc export-ignore
3335
CODE_OF_CONDUCT.md export-ignore
3436
CONTRIBUTING.md export-ignore

‎.github/workflows/test-selenium.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
TESTSUITE_DATABASE_PREFIX: "selenium"
136136
TESTSUITE_SELENIUM_HOST: "127.0.0.1"
137137
TESTSUITE_SELENIUM_PORT: "4444"
138-
run: ./vendor/bin/phpunit --testsuite end-to-end --no-logging --no-coverage --stop-on-skipped --testdox tests/end-to-end/${{ matrix.test-name }}Test.php
138+
run: ./vendor/bin/phpunit --testsuite end-to-end --no-logging --no-coverage --display-all-issues --stop-on-skipped --testdox tests/end-to-end/${{ matrix.test-name }}Test.php
139139

140140
- name: Output logs and stop server
141141
env:

‎.github/workflows/tests.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
composer config version "$(php -r "define('VERSION_SUFFIX', ''); require_once('src/Version.php'); echo \PhpMyAdmin\Version::VERSION;")" && \
5151
composer install && \
5252
./bin/generate-mo && \
53-
php\$V -d memory_limit=512M ./vendor/bin/phpunit --no-logging --no-coverage --testsuite unit %s" \
53+
php\$V -d memory_limit=512M ./vendor/bin/phpunit --no-logging --no-coverage --testsuite unit --display-all-issues %s" \
5454
"${{ matrix.php-version }}" "${{ matrix.exclude-phpunit-groups }}" > ./do-tests.sh
5555
5656
- name: Set up multi arch support
@@ -106,7 +106,7 @@ jobs:
106106
composer-options: ${{ matrix.composer-options }}
107107

108108
- name: Run PHP tests
109-
run: composer run phpunit -- --testsuite unit --display-deprecations --display-notices --display-warnings --display-errors
109+
run: composer run phpunit -- --testsuite unit --display-all-issues
110110

111111
- name: Send coverage
112112
uses: codecov/codecov-action@v3
@@ -165,7 +165,7 @@ jobs:
165165
uses: ramsey/composer-install@v4
166166

167167
- name: Run PHP tests
168-
run: composer run phpunit -- --testsuite unit
168+
run: composer run phpunit -- --testsuite unit --display-all-issues
169169

170170
- name: Send coverage
171171
uses: codecov/codecov-action@v3
@@ -225,7 +225,6 @@ jobs:
225225
composer config --unset platform --no-interaction --ansi
226226
composer remove --dev vimeo/psalm psalm/plugin-phpunit --no-update --no-interaction --ansi
227227
composer require --dev phpunit/phpunit:^"$PHPUNIT_VERSION" --no-update --no-interaction --ansi
228-
composer validate --strict
229228
230229
- name: Install Composer dependencies
231230
uses: ramsey/composer-install@v4

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ phpcs.xml
6161
.phpcs-cache
6262

6363
# PHPUnit
64-
.phpunit.result.cache
65-
phpunit.xml
66-
/tests/bootstrap.php
6764
/tests/gis/*-actual.json
6865
/tests/gis/*-actual.pdf
6966
/tests/gis/*-actual.png

phpunit.xml.dist renamed to phpunit.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
5-
bootstrap="tests/bootstrap-dist.php"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
5+
bootstrap="tests/bootstrap.php"
66
cacheDirectory="build/.phpunit.cache"
77
executionOrder="random"
88
defaultTestSuite="unit"
@@ -11,15 +11,13 @@
1111
displayDetailsOnTestsThatTriggerWarnings="true"
1212
displayDetailsOnTestsThatTriggerNotices="true"
1313
displayDetailsOnTestsThatTriggerErrors="true"
14-
displayDetailsOnTestsThatTriggerDeprecations="false"
1514
displayDetailsOnIncompleteTests="true"
1615
requireCoverageMetadata="true"
1716
beStrictAboutOutputDuringTests="true"
18-
colors="true"
19-
>
17+
colors="true">
2018
<source>
2119
<include>
22-
<directory suffix=".php">src</directory>
20+
<directory>src</directory>
2321
</include>
2422
</source>
2523
<coverage>
@@ -33,10 +31,10 @@
3331
</php>
3432
<testsuites>
3533
<testsuite name="unit">
36-
<directory suffix="Test.php">tests/unit</directory>
34+
<directory>tests/unit</directory>
3735
</testsuite>
3836
<testsuite name="end-to-end">
39-
<directory suffix="Test.php">tests/end-to-end</directory>
37+
<directory>tests/end-to-end</directory>
4038
</testsuite>
4139
</testsuites>
4240
<logging>

tests/bootstrap-dist.php renamed to tests/bootstrap.php

File renamed without changes.

0 commit comments

Comments
 (0)