Skip to content

Commit

Permalink
Merge pull request #64 from stefandoorn/latest-sylius-version
Browse files Browse the repository at this point in the history
Compatible with return types, PHP 7.1 & Sylius 1.0 (fixes #60)
  • Loading branch information
michalmarcinkowski authored Oct 5, 2017
2 parents c9dc6f4 + 933186a commit 6d4edcc
Show file tree
Hide file tree
Showing 10 changed files with 1,088 additions and 671 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ language: php

php:
- 7.1
- 7.0
- 5.6

cache:
directories:
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
}
],
"require": {
"php": "^5.6|^7.0",
"php": "^7.1",

"sylius/sylius": "1.0.0-beta.2",
"sylius/sylius": "^1.0",

"doctrine/phpcr-odm": "^2.0@dev",
"symfony-cmf/block-bundle": "^2.0@dev",
Expand All @@ -41,7 +41,6 @@
"phpspec/phpspec": "^3.2",
"phpunit/phpunit": "^5.6"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 6d4edcc

Please sign in to comment.