Skip to content

Commit

Permalink
Merge pull request #27 from merk/matejvelikonja-more-tests
Browse files Browse the repository at this point in the history
Rebased #26
  • Loading branch information
merk committed Jun 15, 2015
2 parents 924e3f2 + dd38b1b commit a6e8cf7
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
24 changes: 21 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
language: php

php:
- 5.4
- 5.3
- 5.5
- 5.6
- hhvm

matrix:
fast_finish: true
include:
- php: 5.3
env: deps="low"
- php: 5.6
env: SYMFONY_VERSION='2.3.*' SYMFONY_DEPRECATIONS_HELPER=strict
- php: 5.6
env: SYMFONY_VERSION='2.7.*'

env:
global:
- SYMFONY_DEPRECATIONS_HELPER=weak

before_script:
- curl --silent http://getcomposer.org/installer | php
- php composer.phar install --dev --no-interaction --prefer-source
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi
- if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi
- if [ "$deps" != "low" ]; then composer update --prefer-source; fi

script:
- phpunit --coverage-text --colors
Expand Down
10 changes: 6 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@
"php": ">=5.3.2",

"doctrine/common": "~2.3",
"symfony/framework-bundle": "~2.2",
"symfony/form": "~2.2"
"symfony/framework-bundle": "~2.3",
"symfony/form": "~2.3"
},
"require-dev": {
"symfony/symfony": "~2.2",
"symfony/symfony": "~2.3",
"doctrine/orm": "~2.3",
"doctrine/doctrine-bundle": "~1.2",
"components/qunit": "*",
"components/jquery": "*"
"components/jquery": "*",
"robloach/component-installer": "~0.1.1",
"symfony/phpunit-bridge": "^2.7"
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit a6e8cf7

Please sign in to comment.