Skip to content

Commit 366c169

Browse files
committed
Merge branch 'QA'
Signed-off-by: William Desportes <[email protected]>
2 parents 402988f + 6f31612 commit 366c169

7 files changed

Lines changed: 33 additions & 7 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
.travis.yml export-ignore
55
.github export-ignore
66
.weblate export-ignore
7-
codecov.yml export-ignore
7+
.scrutinizer.yml export-ignore
88
phpcs.xml.dist export-ignore
99
phpstan.neon.dist export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.idea/
22
vendor/
33
doc/
4+
build/
45
.composer.json
56
composer.lock
67
coverage.xml

.scrutinizer.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# scrutinizer-ci.com configuration
2+
imports:
3+
- php
4+
filter:
5+
excluded_paths:
6+
- build/
7+
- tmp/
8+
- vendor/
9+
- tools/doctum-config.php
10+
checks:
11+
php: true
12+
tools:
13+
external_code_coverage:
14+
runs: 4 # php 7.x versions
15+
timeout: 480 # 8 min
16+
build:
17+
nodes:
18+
analysis:
19+
environment:
20+
php: 7.1
21+
dependencies:
22+
before:
23+
- composer install
24+
tests:
25+
override:
26+
- php-scrutinizer-run
27+
- phpcs-run

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ install:
5656

5757
after_success:
5858
- bash <(curl -s https://codecov.io/bash)
59+
- if [ -f build/logs/clover.xml ] ; then curl -LsO https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi
5960

6061
cache:
6162
directories:

codecov.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

phpcs.xml.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
2-
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd">
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
33
<!-- Show progress and sniff codes -->
44
<arg value="ps"/>
55

6-
<arg name="cache"/>
6+
<arg name="cache" value=".php_cs.cache"/>
77
<arg name="colors"/>
88
<arg name="extensions" value="php"/>
99

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
processIsolation="false"
1212
stopOnFailure="false">
1313
<logging>
14-
<log type="coverage-clover" target="coverage.xml" />
14+
<log type="coverage-clover" target="build/logs/clover.xml" />
1515
</logging>
1616
<testsuites>
1717
<testsuite name="Builder">

0 commit comments

Comments
 (0)