Skip to content

Commit

Permalink
Merge branch '1.1' into 1.2
Browse files Browse the repository at this point in the history
* 1.1:
  Apply coding standard fixes
  Update "Configuring taxation" docs
  [GridBundle] Do not put unnecessary "andWhere" in ExpressionBuilder
  [Grid] Fix getting enabled grid items
  [ThemeBundle] Replace "symfony/symfony" dependency with specific Symfony packages
  Keep the existing pagination when changing sorting on product list page
  Fix API validation tests
  [ShippingBundle] Add validation for ShippingMethod calculator
  Narrow down selectors to prevent unexpected bugs
  [CoreBundle] Make sure promotion action/rule amount is an integer
  set gender `u` as default value - resolves Sylius#8493
  [Order] Fixed sylius:remove-expired-carts help
  Make ArrayGridProvider more performant & suitable for PHP-PM
  [Documentation] Fix API example for creating a taxon
  • Loading branch information
pamil committed Oct 3, 2018
2 parents 9af103c + 7cf413a commit af7e4c3
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions composer.json
Expand Up @@ -23,7 +23,19 @@
"php": "^7.1",

"doctrine/common": "^2.5",
"symfony/symfony": "^3.4|^4.1.1",
"symfony/asset": "^3.4|^4.1.1",
"symfony/config": "^3.4|^4.1.1",
"symfony/console": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/filesystem": "^3.4|^4.1.1",
"symfony/finder": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"symfony/framework-bundle": "^3.4|^4.1.1",
"symfony/http-foundation": "^3.4|^4.1.1",
"symfony/http-kernel": "^3.4|^4.1.1",
"symfony/options-resolver": "^3.4|^4.1.1",
"symfony/templating": "^3.4|^4.1.1",
"symfony/translation": "^3.4|^4.1.1",
"zendframework/zend-hydrator": "^2.2"
},
"require-dev": {
Expand All @@ -32,10 +44,11 @@
"mikey179/vfsStream": "^1.6",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^6.5",
"sylius/registry": "^1.2",
"twig/twig": "^2.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/twig-bundle": "^3.4|^4.1.1"
"sylius/registry": "^1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/security-csrf": "^3.4|^4.1.1",
"symfony/twig-bundle": "^3.4|^4.1.1",
"twig/twig": "^2.0"
},
"conflict": {
"twig/twig": "^1.0"
Expand Down

0 comments on commit af7e4c3

Please sign in to comment.