Skip to content

Commit

Permalink
Merge branch '1.0' into 1.1
Browse files Browse the repository at this point in the history
* 1.0:
  Update to v1.0.12
  • Loading branch information
pamil committed Mar 16, 2018
2 parents e71f800 + 9ac6c13 commit 9fefc27
Show file tree
Hide file tree
Showing 2 changed files with 4,185 additions and 4,030 deletions.
17 changes: 7 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,29 @@
"require": {
"php": "^7.1",

"sylius/sylius": "1.1.*",
"sylius-labs/coding-standard": "^1.0"
"sylius/sylius": "1.1.*"
},
"require-dev": {
"behat/behat": "^3.4",
"behat/mink": "^1.7",
"behat/mink-browserkit-driver": "^1.3",
"behat/mink-extension": "^2.2",
"behat/mink-selenium2-driver": "^1.3",
"bossa/phpspec2-expect": "^1.0",
"coduo/php-matcher": "^2.1",
"dama/doctrine-test-bundle": "^1.0",
"friends-of-behat/context-service-extension": "^0.3",
"friends-of-behat/cross-container-extension": "^0.2",
"friends-of-behat/context-service-extension": "^1.0",
"friends-of-behat/cross-container-extension": "^1.0",
"friends-of-behat/performance-extension": "^1.0",
"friends-of-behat/service-container-extension": "^1.0",
"friends-of-behat/suite-settings-extension": "^1.0",
"friends-of-behat/symfony-extension": "^1.0",
"friends-of-behat/variadic-extension": "^1.0",
"lakion/api-test-case": "^1.0",
"lakion/api-test-case": "^2.0",
"lakion/mink-debug-extension": "^1.2.3",
"phpspec/phpspec": "^3.4",
"phpunit/phpunit": "^5.6",
"phpunit/phpunit": "^6.5",
"se/selenium-server-standalone": "^2.52",
"sensio/generator-bundle": "^3.1",
"stripe/stripe-php": "^4.1"
"stripe/stripe-php": "^4.1",
"sylius-labs/coding-standard": "^1.0"
},
"prefer-stable": true,
"scripts": {
Expand Down
Loading

0 comments on commit 9fefc27

Please sign in to comment.