Skip to content

Commit 64b1a5d

Browse files
committed
fix(ci): Fix php-cs-fixer workflow and phpunit config
Signed-off-by: Marcel Klehr <[email protected]>
1 parent eba1910 commit 64b1a5d

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/lint-php-cs.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ jobs:
5353
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5454

5555
- name: Install dependencies
56-
run: composer i
56+
run: |
57+
composer i # twice because of php-scoper
58+
composer i
5759
5860
- name: Lint
5961
run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )

tests/phpunit.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" timeoutForSmallTests="900" timeoutForMediumTests="900" timeoutForLargeTests="900" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="bootstrap.php" timeoutForSmallTests="900" timeoutForMediumTests="900" timeoutForLargeTests="900" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
33
<coverage>
4-
<include>
5-
<directory suffix=".php">../appinfo</directory>
6-
<directory suffix=".php">../lib</directory>
7-
</include>
84
<report>
95
<clover outputFile="./clover.xml"/>
106
</report>
@@ -16,4 +12,10 @@
1612
<logging>
1713
<!-- and this is where your report will be written -->
1814
</logging>
15+
<source>
16+
<include>
17+
<directory suffix=".php">../appinfo</directory>
18+
<directory suffix=".php">../lib</directory>
19+
</include>
20+
</source>
1921
</phpunit>

0 commit comments

Comments
 (0)