Skip to content

Commit 953e3c4

Browse files
committed
Sync configuration files with the main repository and add Scrutinizer config
Signed-off-by: William Desportes <[email protected]>
1 parent e01422f commit 953e3c4

6 files changed

Lines changed: 44 additions & 20 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
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

.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: 10 # php 7.x and 5.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
@@ -39,6 +39,7 @@ install:
3939

4040
after_success:
4141
- bash <(curl -s https://codecov.io/bash)
42+
- 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
4243

4344
cache:
4445
directories:

codecov.yml

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

phpcs.xml.dist

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
<?xml version="1.0"?>
2-
<ruleset
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
name="phpMyAdmin"
5-
xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd"
6-
>
2+
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
3+
<!-- Show progress and sniff codes -->
4+
<arg value="ps"/>
5+
6+
<arg name="cache" value=".php_cs.cache"/>
7+
<arg name="colors"/>
8+
<arg name="extensions" value="php"/>
9+
10+
<file>src</file>
11+
<file>tests</file>
12+
<file>tools</file>
13+
14+
<exclude-pattern>*/tools/doctum-config.php</exclude-pattern>
15+
716
<rule ref="Squiz.Arrays.ArrayDeclaration.IndexNoNewline">
817
<exclude-pattern>*/src/Contexts/*</exclude-pattern>
918
</rule>
@@ -50,14 +59,4 @@
5059
<rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore">
5160
<severity>0</severity>
5261
</rule>
53-
54-
<arg value="sp"/>
55-
<arg name="colors"/>
56-
<arg name="extensions" value="php"/>
57-
58-
<exclude-pattern>*/tools/doctum-config.php</exclude-pattern>
59-
60-
<file>src</file>
61-
<file>tests</file>
62-
<file>tools</file>
6362
</ruleset>

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)