Skip to content

Commit

Permalink
Merge pull request #17 from rokka-io/remove-symfony-lock-from-tests
Browse files Browse the repository at this point in the history
Remove usage of dunglas/symfony-lock from tests
  • Loading branch information
dbu committed Jan 15, 2020
2 parents 6cee901 + c18885a commit ee4dc14
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
18 changes: 12 additions & 6 deletions .travis.yml
Expand Up @@ -31,19 +31,25 @@ matrix:
- php: 7.2
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"

# Install all SF components in the same major version, see https://github.com/dunglas/symfony-lock
# Latest SF 3.x
# Testing with SF 4.4 (current and minimum supported version)
- php: 7.2
env: DEPENDENCIES="dunglas/symfony-lock:^3"
# Minimum supported SF 3.x
env: SYMFONY_REQUIRE=4.4.*
- php: 7.2
env:
- DEPENDENCIES="dunglas/symfony-lock:^3"
- SYMFONY_REQUIRE=4.4.*
- COMPOSER_FLAGS="--prefer-stable --prefer-lowest"

# Testing with SF 3.4 (current and minimum supported version)
- php: 7.2
env: SYMFONY_REQUIRE=3.4.*
- php: 7.2
env:
- SYMFONY_REQUIRE=3.4.*
- COMPOSER_FLAGS="--prefer-stable --prefer-lowest"

before_install:
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
- if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
- composer global require --no-progress --no-scripts --no-plugins symfony/flex

install:
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -37,7 +37,7 @@
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.0",
"symfony/phpunit-bridge": "^3.3"
"symfony/phpunit-bridge": "^5.0"
},
"extra": {
"branch-alias": {
Expand Down
6 changes: 1 addition & 5 deletions phpunit.xml.dist
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
syntaxCheck="true">
>

<testsuites>
Expand Down

0 comments on commit ee4dc14

Please sign in to comment.