Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,21 @@ cache:
directories:
- $HOME/.composer/cache

php:
- '7.0'
matrix:
include:
- php: '7.0'
- php: '7.0'
env: deps="low"

before_install:
- phpenv config-rm xdebug.ini
- phpunit --self-update
- npm install -g swagger-cli

install:
- composer update --no-interaction --prefer-dist
- if [[ ! $deps ]]; then composer update --no-progress --ansi; fi
- if [[ $deps = low ]]; then composer update --no-progress --ansi --prefer-lowest --prefer-stable; fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we are removing phpunit because it's a project dependency and not a dev dependency then the same should be done for behat

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should indeed, but that's not so easy (because ok Mink and Symfony Extension). But if you have some time to do it, you're very welcome!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no easy way then, but maybe using a composer plugin for that would be the solution. I will investigate that when I'm back in London :)


script:
- vendor/bin/phpunit
- phpunit
- vendor/bin/behat
- tests/Fixtures/app/console api:swagger:export > swagger.json && swagger validate swagger.json && rm swagger.json
21 changes: 11 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,34 @@

"doctrine/inflector": "^1.0",
"psr/cache": "^1.0",
"symfony/http-foundation": "^2.3 || ^3.0",
"symfony/http-kernel": "^2.8 || ^3.0",
"symfony/property-info": "^2.8 || ^3.0 ",
"symfony/http-foundation": "^2.7 || ^3.0",
"symfony/http-kernel": "^2.7 || ^3.0",
"symfony/property-info": "^3.1",
"symfony/serializer": "^3.1",
"willdurand/negotiation": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "^5.0",
"behat/behat": "^3.1",
"behat/mink": "^1.7",
"behat/mink-browserkit-driver": "^1.3.1",
"behat/mink-extension": "^2.2",
"behat/symfony2-extension": "^2.1",
"behatch/contexts": "^2.5",
"doctrine/doctrine-bundle": "^1.6@dev",
"doctrine/orm": "^2.2.3",
"doctrine/doctrine-bundle": "^1.6.3",
"doctrine/orm": "^2.5",
"doctrine/annotations": "^1.2",
"friendsofsymfony/user-bundle": "^2.0@dev",
"nelmio/api-doc-bundle": "^2.11.2",
"php-mock/php-mock-phpunit": "^1.1",
"phpdocumentor/reflection-docblock": "^3.0",
"symfony/cache": "^3.1",
"symfony/dependency-injection": "^2.8 || ^3.0",
"symfony/dependency-injection": "^2.7 || ^3.0",
"symfony/framework-bundle": "^3.1",
"symfony/phpunit-bridge": "^3.1",
"symfony/doctrine-bridge": "^2.8 || ^3.0",
"symfony/phpunit-bridge": "^2.7 || ^3.0",
"symfony/security": "^2.7 || ^3.0",
"symfony/validator": "^2.5 || ^3.0",
"symfony/finder": "^2.8 || ^3.1"
"symfony/validator": "^2.7 || ^3.0",
"symfony/finder": "^2.7 || ^3.0"
},
"suggest": {
"friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.",
Expand Down