Merge branch '1.1' into 1.2

* 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

Resources/views/Product/Index/_sorting.html.twig

@@ -3,7 +3,7 @@
 {% set definition = resources.definition %}
 
 {% set route = app.request.attributes.get('_route') %}
-{% set route_parameters = app.request.attributes.get('_route_params') %}
+{% set route_parameters = app.request.attributes.get('_route_params')|merge(app.request.query.all) %}
 
 {% set criteria = app.request.query.get('criteria', {}) %}
 

composer.json

@@ -31,7 +31,8 @@
         "sonata-project/intl-bundle": "^2.2",
         "sylius/core-bundle": "^1.2",
         "sylius/ui-bundle": "^1.2",
-        "symfony/framework-bundle": "^3.4|^4.1.1"
+        "symfony/framework-bundle": "^3.4|^4.1.1",
+        "symfony/security-bundle": "^3.4|^4.1.1"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^3.0",