Skip to content

Commit

Permalink
Merge pull request #32 from spryker-eco/feature/eco-3340-fix-dependen…
Browse files Browse the repository at this point in the history
…sies

feature/eco-3340 allow new version of spryker/oms and spryker/sales
  • Loading branch information
alex-galych authored Dec 10, 2019
2 parents 84771f2 + efcb654 commit 0e2a0f5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ sudo: required
matrix:
fast_finish: true
include:
- php: 7.1
- php: 7.2
env:
- PRODUCT_NAME=suite
- php: 7.1

- php: 7.2
env:
- PRODUCT_NAME=b2c-demo-shop
- php: 7.1

- php: 7.2
env:
- PRODUCT_NAME=b2b-demo-shop

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
"description": "Computop module",
"license": "MIT",
"require": {
"php": ">=7.2",
"spryker/application": "^3.0.0",
"spryker/calculation": "^4.0.0",
"spryker/checkout-extension": "^1.0.0",
"spryker/config": "^3.0.0",
"spryker/kernel": "^3.0.0",
"spryker/messenger": "^3.0.0",
"spryker/money": "^2.0.0",
"spryker/oms": "^7.0.0 || ^8.0.0 || ^10.0.0",
"spryker/oms": "^7.0.0 || ^8.0.0 || ^10.0.0 || ^11.0.0",
"spryker/propel-orm": "^1.6.0",
"spryker/quote": "^1.0.0 || ^2.0.0",
"spryker/sales": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^10.0.0",
"spryker/sales": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^10.0.0 || ^11.0.0",
"spryker/silex": "^2.0.0",
"spryker/step-engine": "^3.1.0",
"spryker/symfony": "^3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class FacadeDBActionTest extends AbstractSetUpTest
/**
* @return void
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ abstract protected function createComputopApiFacade();
*
* @return void
*/
public function setUp()
public function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit 0e2a0f5

Please sign in to comment.