Skip to content

Commit

Permalink
Merge e57241c into a8bdda4
Browse files Browse the repository at this point in the history
  • Loading branch information
kunicmarko20 committed May 1, 2018
2 parents a8bdda4 + e57241c commit 0277932
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 6 deletions.
14 changes: 11 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ cache:

env:
global:
- PHPUNIT_FLAGS="-v --exclude-group installation"
- PHPUNIT_FLAGS="-v"
- SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
- TARGET=test

Expand All @@ -22,10 +22,18 @@ matrix:
- php: 7.0
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"

# Coverage
- php: 7.1
env:
- PHPUNIT_FLAGS="-v --coverage-clover build/logs/clover.xml"
- SYMFONY_PHPUNIT_VERSION="6.5"
- COVERAGE=true

# Test LTS versions. This makes sure we do not use Symfony packages with version greater
# than 2 or 3 respectively. Read more at https://github.com/symfony/lts
- php: 7.1
env: DEPENDENCIES="symfony/lts:^2" PHPUNIT_FLAGS="-v --coverage-clover build/clover.xml --exclude-group installation" SYMFONY_PHPUNIT_VERSION="6.5" COVERAGE=true
env: DEPENDENCIES="symfony/lts:^2"

- php: 7.2
env: DEPENDENCIES="symfony/lts:^3"

Expand All @@ -42,7 +50,6 @@ matrix:
- env: STABILITY="dev"

before_install:
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
- if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;

Expand All @@ -51,6 +58,7 @@ install:

script:
- if [ -x .travis/script_${TARGET}.sh ]; then .travis/script_${TARGET}.sh; fi;

after_success: .travis/success.sh

branches:
Expand Down
7 changes: 5 additions & 2 deletions .travis/success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ set -e
COVERAGE=${COVERAGE-false}

if [ "${COVERAGE}" == true ]; then
wget https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
# Coveralls client install
wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
chmod u+x "${HOME}/bin/coveralls"

coveralls -v
fi;
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ General:
Quality:
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/?branch=master)
[![Scrutinizer Build](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/badges/build.png?b=master)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/badges/quality-score.png?b=master)
[![Scrutinizer Code Coverage](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/FriendsOfSymfony/FOSCKEditorBundle/badge.svg)](https://coveralls.io/github/FriendsOfSymfony/FOSCKEditorBundle)
[![Scrutinizer Code Intelligence](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/badges/code-intelligence.svg?b=master)](https://scrutinizer-ci.com/g/FriendsOfSymfony/FOSCKEditorBundle/?branch=master)

Numbers:
Expand Down
8 changes: 8 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,21 @@
<directory>./tests</directory>
</testsuite>
</testsuites>

<groups>
<exclude>
<group>installation</group>
</exclude>
</groups>

<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./src/Resources</directory>
<directory>./tests</directory>
<directory>./vendor</directory>
<group>installation</group>
</exclude>
</whitelist>
</filter>
Expand Down

0 comments on commit 0277932

Please sign in to comment.