Skip to content

Commit

Permalink
Merge 7253d82 into f84c680
Browse files Browse the repository at this point in the history
  • Loading branch information
stefandoorn committed Oct 17, 2017
2 parents f84c680 + 7253d82 commit 21a84c7
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 37 deletions.
16 changes: 16 additions & 0 deletions .travis.yml
Expand Up @@ -17,6 +17,22 @@ matrix:
- TRAVIS_NODE_VERSION="7.5"
services:
- memcached
-
sudo: required
php: 7.2
env:
- SYLIUS_SUITE="application"
- TRAVIS_NODE_VERSION="7.5"
services:
- memcached
-
sudo: false
php: 7.2
env: SYLIUS_SUITE="packages"
addons:
apt:
packages:
- parallel
-
sudo: false
php: 7.1
Expand Down
6 changes: 4 additions & 2 deletions composer.json
Expand Up @@ -37,15 +37,18 @@
"fzaninotto/faker": "^1.6",
"gedmo/doctrine-extensions": "^2.4.12",
"incenteev/composer-parameter-handler": "^2.1",
"jeremykendall/php-domain-parser": "^4.0.3@alpha",
"jms/serializer-bundle": "^2.0",
"knplabs/knp-gaufrette-bundle": "^0.3",
"knplabs/knp-menu-bundle": "^2.1",
"league/uri": "^4.2.3",
"liip/imagine-bundle": "^1.9.1",
"ocramius/proxy-manager": "^2.1",
"payum/payum": "^1.4",
"payum/payum-bundle": "^2.2",
"php-http/guzzle6-adapter": "^1.1",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"ramsey/uuid": "^3.7",
"sensio/distribution-bundle": "^5.0.21",
"sonata-project/block-bundle": "^3.3",
"sonata-project/intl-bundle": "^2.2",
Expand All @@ -65,8 +68,7 @@
"willdurand/hateoas-bundle": "^1.2",
"winzou/state-machine-bundle": "^0.3",
"zendframework/zend-hydrator": "^2.2",
"zendframework/zend-stdlib": "^3.1",
"ramsey/uuid": "^3.7"
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"akeneo/phpspec-skip-example-extension": "^3.0",
Expand Down
116 changes: 81 additions & 35 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 21a84c7

Please sign in to comment.