Skip to content

Commit

Permalink
Merge branch 'master' into keep-import-to-mq-running
Browse files Browse the repository at this point in the history
  • Loading branch information
enesaktay authored Jul 25, 2018
2 parents 0563083 + 5158b78 commit 21e4c30
Show file tree
Hide file tree
Showing 54 changed files with 814 additions and 1,170 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ before_script:
script:
- composer validate --strict
- bin/phpstan.phar analyse -c phpstan.neon -l max src/
- bin/easy-coding-standard check src/ spec/
- bin/ecs check src/ spec/ tests/Behat/

# - bin/phpunit
- bin/phpspec run
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
"predis/predis" : "To support message queuing"
},
"require-dev": {
"portphp/excel": "^1.1.0",
"portphp/csv": "^1.1.0",
"behat/behat": "^3.3",
"behat/mink": "^1.7",
"behat/mink-browserkit-driver": "^1.3",
"behat/mink-extension": "^2.2",
"behat/mink-selenium2-driver": "^1.3",
"enqueue/enqueue-bundle": "^0.8.31",
"enqueue/redis": "^0.8.23",
"friends-of-behat/context-service-extension": "^1.0",
"friends-of-behat/cross-container-extension": "^1.0",
"friends-of-behat/performance-extension": "^1.0",
Expand All @@ -36,12 +36,12 @@
"phpspec/phpspec": "^3.2",
"phpstan/phpstan-shim": "^0.9.2",
"phpunit/phpunit": "^5.6",
"portphp/csv": "^1.1.0",
"portphp/excel": "^1.1.0",
"predis/predis": "^1.1",
"se/selenium-server-standalone": "^2.52",
"sylius-labs/coding-standard": "^1.0",
"symplify/easy-coding-standard": "^2.4",
"enqueue/enqueue-bundle": "^0.8.31",
"enqueue/redis": "^0.8.23",
"predis/predis": "^1.1"
"sylius-labs/coding-standard": "^2.0",
"symplify/easy-coding-standard": "^4.5"
},
"prefer-stable": true,
"minimum-stability": "alpha",
Expand Down
Loading

0 comments on commit 21e4c30

Please sign in to comment.