Skip to content

Commit 2e956ba

Browse files
committed
ci fixes
1 parent 6a03128 commit 2e956ba

File tree

3 files changed

+29
-21
lines changed

3 files changed

+29
-21
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
--coverage-clover ./coverage.xml
3535
- name: Annotate with Metrics
3636
run: |
37-
find src -name "*.php" | xargs ./vendor/bin/metrics annotate ./coverage.xml
37+
find src -name "*.php" | xargs -n 1 ./vendor/bin/metrics annotate ./coverage.xml
3838
- name: Refactor with Rector
3939
run: |
4040
./vendor/bin/rector process src
4141
- name: Tidy Source Code
4242
run: |
43-
find tests -name "*.php" | xargs ./vendor/bin/phptidy.php replace
44-
find src -name "*.php" | xargs ./vendor/bin/phptidy.php replace
43+
find tests -name "*.php" | xargs -n 1 ./vendor/bin/phptidy.php replace
44+
find src -name "*.php" | xargs -n 1 ./vendor/bin/phptidy.php replace
4545
- name: Push Back Changes
4646
run: |
4747
git diff --exit-code src || ( \

phpunit.xml.dist

+26-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
<?xml version="1.0"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3-
<coverage includeUncoveredFiles="true">
4-
<include>
5-
<directory suffix=".php">src/</directory>
6-
</include>
7-
<exclude>
8-
<directory suffix=".php">tests/</directory>
9-
</exclude>
10-
<report>
11-
<clover outputFile="clover.xml"/>
12-
</report>
13-
</coverage>
14-
<testsuite name="Default">
15-
<directory>tests/</directory>
16-
</testsuite>
17-
<logging/>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
4+
bootstrap="vendor/autoload.php"
5+
executionOrder="depends,defects"
6+
forceCoversAnnotation="false"
7+
beStrictAboutCoversAnnotation="true"
8+
beStrictAboutOutputDuringTests="true"
9+
beStrictAboutTodoAnnotatedTests="true"
10+
failOnRisky="true"
11+
failOnWarning="true"
12+
verbose="true">
13+
<testsuites>
14+
<testsuite name="default">
15+
<directory>tests</directory>
16+
</testsuite>
17+
</testsuites>
18+
19+
<coverage processUncoveredFiles="true">
20+
<include>
21+
<directory suffix=".php">src</directory>
22+
</include>
23+
<exclude>
24+
<file>src/bootstrap.php</file>
25+
</exclude>
26+
</coverage>
1827
<php>
1928
<includePath>app/code</includePath>
2029
<env name="SS_DATABASE_CLASS" value="SQLite3Database"/>

src/Widgets/UserFormWidget.php

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ class UserFormWidget extends Widget
3434

3535
/**
3636
*
37-
* @Metrics( crap = 1 )
3837
* @return unknown
3938
*/
4039

0 commit comments

Comments
 (0)