Skip to content

Commit

Permalink
Sync configuration files with the main repository and add Scrutinizer…
Browse files Browse the repository at this point in the history
… config

Signed-off-by: William Desportes <williamdes@wdes.fr>
  • Loading branch information
williamdes committed Aug 16, 2020
1 parent e01422f commit 953e3c4
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Expand Up @@ -4,5 +4,5 @@
.travis.yml export-ignore
.github export-ignore
.weblate export-ignore
codecov.yml export-ignore
.scrutinizer.yml export-ignore
phpcs.xml.dist export-ignore
27 changes: 27 additions & 0 deletions .scrutinizer.yml
@@ -0,0 +1,27 @@
# scrutinizer-ci.com configuration
imports:
- php
filter:
excluded_paths:
- build/
- tmp/
- vendor/
- tools/doctum-config.php
checks:
php: true
tools:
external_code_coverage:
runs: 10 # php 7.x and 5.x versions
timeout: 480 # 8 min
build:
nodes:
analysis:
environment:
php: 7.1
dependencies:
before:
- composer install
tests:
override:
- php-scrutinizer-run
- phpcs-run
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -39,6 +39,7 @@ install:

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

cache:
directories:
Expand Down
3 changes: 0 additions & 3 deletions codecov.yml

This file was deleted.

29 changes: 14 additions & 15 deletions phpcs.xml.dist
@@ -1,9 +1,18 @@
<?xml version="1.0"?>
<ruleset
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
name="phpMyAdmin"
xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd"
>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
<!-- Show progress and sniff codes -->
<arg value="ps"/>

<arg name="cache" value=".php_cs.cache"/>
<arg name="colors"/>
<arg name="extensions" value="php"/>

<file>src</file>
<file>tests</file>
<file>tools</file>

<exclude-pattern>*/tools/doctum-config.php</exclude-pattern>

<rule ref="Squiz.Arrays.ArrayDeclaration.IndexNoNewline">
<exclude-pattern>*/src/Contexts/*</exclude-pattern>
</rule>
Expand Down Expand Up @@ -50,14 +59,4 @@
<rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore">
<severity>0</severity>
</rule>

<arg value="sp"/>
<arg name="colors"/>
<arg name="extensions" value="php"/>

<exclude-pattern>*/tools/doctum-config.php</exclude-pattern>

<file>src</file>
<file>tests</file>
<file>tools</file>
</ruleset>
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Expand Up @@ -11,7 +11,7 @@
processIsolation="false"
stopOnFailure="false">
<logging>
<log type="coverage-clover" target="coverage.xml" />
<log type="coverage-clover" target="build/logs/clover.xml" />
</logging>
<testsuites>
<testsuite name="Builder">
Expand Down

0 comments on commit 953e3c4

Please sign in to comment.