diff --git a/docs/book/orders/shipments.rst b/docs/book/orders/shipments.rst
index 81d681a2d22..2d075c791a2 100644
--- a/docs/book/orders/shipments.rst
+++ b/docs/book/orders/shipments.rst
@@ -56,7 +56,7 @@ At the end add it to the system using a repository.
$shippingMethod->setCode('DHL');
$shippingMethod->setCalculator(DefaultCalculators::FLAT_RATE);
- $shippingMethod->setConfiguration(['amount' => 50]);
+ $shippingMethod->setConfiguration(['channel_code' => ['amount' => 50]]);
$zone = $this->container->get('sylius.repository.zone')->findOneByCode('US');
$shippingMethod->setZone($zone);
@@ -67,6 +67,7 @@ In order to have your shipping method available in checkout add it to a desired
.. code-block:: php
+ $channel = $this->container->get('sylius.repository.channel')->findOneByCode('channel_code');
$channel->addShippingMethod($shippingMethod);
Shipping Zones
diff --git a/features/product/managing_product_reviews/editing_product_review.feature b/features/product/managing_product_reviews/editing_product_review.feature
index 20078dbf556..2e1750433d0 100644
--- a/features/product/managing_product_reviews/editing_product_review.feature
+++ b/features/product/managing_product_reviews/editing_product_review.feature
@@ -5,7 +5,7 @@ Feature: Editing product reviews
I want to edit a product review
Background:
- Given the store has customer "Mike Ross" with email "ross@teammike.com"
+ Given there is a customer "Mike Ross" with an email "ross@teammike.com" and a password "thePassword"
And the store has a product "Lamborghini Gallardo Model"
And this product has a review titled "Awesome" and rated 4 with a comment "Nice product" added by customer "ross@teammike.com"
And I am logged in as an administrator
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
index a0e6361053f..19443adfb25 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
@@ -17,6 +17,7 @@
+
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml
new file mode 100644
index 00000000000..81552c6574b
--- /dev/null
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services/form.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+ sylius
+
+
+
diff --git a/src/Sylius/Bundle/ReviewBundle/Resources/config/validation/Review.xml b/src/Sylius/Bundle/ReviewBundle/Resources/config/validation/Review.xml
index d608b56dc3a..f5550038c04 100644
--- a/src/Sylius/Bundle/ReviewBundle/Resources/config/validation/Review.xml
+++ b/src/Sylius/Bundle/ReviewBundle/Resources/config/validation/Review.xml
@@ -17,7 +17,7 @@