Skip to content

Commit

Permalink
Merge pull request #113 from Ener-Getick/SF3
Browse files Browse the repository at this point in the history
Add symfony 3.0 support
  • Loading branch information
slashfan committed Nov 23, 2015
2 parents 68c9ad3 + eacd6d1 commit f096e2c
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 35 deletions.
37 changes: 23 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
language: php

php:
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm
sudo: false

env:
- SYMFONY_VERSION=2.3.*
- SYMFONY_VERSION=2.6.*
- SYMFONY_VERSION=2.7.*
global:
- SYMFONY_DEPRECATIONS_HELPER: weak

cache:
directories:
- $HOME/.composer/cache

matrix:
allow_failures:
fast_finish: true
include:
- php: 5.3
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.4
- php: 5.5
- php: 5.6
- php: 5.6
env: SYMFONY_VERSION='2.8.*@dev' SYMFONY_DEPRECATIONS_HELPER: strict
- php: 5.6
env: SYMFONY_VERSION='3.0.*@dev' SYMFONY_DEPRECATIONS_HELPER: strict
- php: 7.0
- php: hhvm

before_script:
- composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
- composer update --dev --prefer-source
before_install:
- composer self-update
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi

install: composer update $COMPOSER_FLAGS --prefer-source

script: phpunit
10 changes: 0 additions & 10 deletions Tests/autoload.php.dist

This file was deleted.

7 changes: 0 additions & 7 deletions Tests/bootstrap.php

This file was deleted.

6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
],
"require": {
"php": ">=5.3.3",
"symfony/symfony": "~2.3",
"symfony/framework-bundle": "~2.3",
"symfony/symfony": "~2.3|~3.0",
"namshi/jose": "~2.2"
},
"suggest": {
Expand All @@ -42,6 +41,7 @@
}
},
"require-dev": {
"phpunit/phpunit": "~4.1"
"phpunit/phpunit": "~4.1",
"symfony/phpunit-bridge": "~2.7|~3.0"
}
}
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="Tests/bootstrap.php"
bootstrap="vendor/autoload.php"
>
<testsuites>
<testsuite name="LexikJWTAuthenticationBundle Test Suite">
Expand Down

0 comments on commit f096e2c

Please sign in to comment.