Skip to content

Commit 3699b77

Browse files
committed
Bug #95 : Upgrade PHP version & PHPUnit version
1 parent b167771 commit 3699b77

24 files changed

+4972
-3996
lines changed

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php" : ">=5.0.0"
1414
},
1515
"require-dev" : {
16-
"phpunit/phpunit" : "^4.8"
16+
"phpunit/phpunit" : ">=7.0.0"
1717
},
1818
"support" : {
1919
"wiki" : "https://github.com/phpcheckstyle/phpcheckstyle/wiki",
@@ -27,5 +27,7 @@
2727
"src/PHPCheckstyle/_Constants.php"
2828
]
2929
},
30-
"bin" : ["phpcheckstyle"]
31-
}
30+
"bin" : [
31+
"phpcheckstyle"
32+
]
33+
}

phpcheckstyle_sample.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
echo "PHP CheckStyle script"
3+
php run.php --src ./test/sample --outdir ./checkstyle_result --config default.cfg.xml --format html,xml --linecount
4+

phpunit.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<file>./test/UnusedTest.php</file>
1717
</testsuite>
1818

19-
<filter>
20-
<whitelist>
21-
<directory suffix=".php">./src/</directory>
22-
</whitelist>
23-
</filter>
24-
19+
<coverage>
20+
<include>
21+
<directory suffix=".php">./src</directory>
22+
</include>
23+
</coverage>
24+
2525
<logging>
26-
<log type="coverage-html" target="./checkstyle_result/phpunit/coverage" title="OCRE" />
27-
<log type="coverage-clover" target="./checkstyle_result/phpunit/coverage.xml" />
28-
<log type="junit" target="./checkstyle_result/phpunit/junit.xml" />
26+
<junit outputFile="./checkstyle_result/phpunit/junit.xml" />
27+
<testdoxHtml outputFile="./checkstyle_result/phpunit/coverage.html" />
28+
<testdoxXml outputFile="./checkstyle_result/phpunit/coverage.xml" />
2929
</logging>
3030

3131
</phpunit>

0 commit comments

Comments
 (0)