Merge branch 'hotfix/fix-psr7-relative-path'

Author: Jens Schulze

composer.json

@@ -25,7 +25,7 @@
         "php": ">=5.4",
         "psr/log": "^1.0",
         "guzzlehttp/guzzle": "^5.0 || ^6.0",
-        "guzzlehttp/psr7": "^1.0",
+        "guzzlehttp/psr7": "^1.1",
         "pimple/pimple": "^3.0"
     },
     "require-dev": {

features/request/Cart/CartCreate.feature

@@ -6,7 +6,7 @@ Feature: I want to create a new cart
 
   Scenario: create a anonymous cart
     When i want to create a "cart"
-    Then the path should be "/carts"
+    Then the path should be "carts"
     And the method should be "POST"
     And the request should be
     """

features/request/Cart/CartDelete.feature

@@ -2,5 +2,5 @@ Feature: I want to delete a cart
   Scenario: Delete cart
     Given a "cart" is identified by "id" and "version"
     And i want to delete a "Cart"
-    Then the path should be "/carts/id?version=version"
+    Then the path should be "carts/id?version=version"
     And the method should be "DELETE"

features/request/Cart/CartQuery.feature

@@ -2,49 +2,49 @@ Feature: I want to query carts
   Scenario: Fetch a cart by id
     Given a "cart" is identified by "id"
     Given i want to fetch a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "GET"
 
   Scenario: Query carts
     Given a "cart" is identified by "id"
     Given i want to fetch a "cart" by customerId
     And query by customers id "id"
-    Then the path should be "/carts?customerId=id"
+    Then the path should be "carts?customerId=id"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "Carts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "/carts?where=name%3D%22Peter%22"
+    Then the path should be "carts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "Carts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "/carts?where=name%3D%22Peter%22"
+    Then the path should be "carts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with limit
     Given i want to query "Carts"
     And limit the result to "10"
-    Then the path should be "/carts?limit=10"
+    Then the path should be "carts?limit=10"
     And the method should be "GET"
 
   Scenario: Query customers with offset
     Given i want to query "Carts"
     And offset the result with "10"
-    Then the path should be "/carts?offset=10"
+    Then the path should be "carts?offset=10"
     And the method should be "GET"
 
   Scenario: Query customers sorted
     Given i want to query "Carts"
     And sort them by "name"
-    Then the path should be "/carts?sort=name"
+    Then the path should be "carts?sort=name"
     And the method should be "GET"
 
   Scenario: Query parameters should be sorted
     Given i want to query "Carts"
     And sort them by "name"
     And offset the result with "10"
-    Then the path should be "/carts?offset=10&sort=name"
+    Then the path should be "carts?offset=10&sort=name"
     And the method should be "GET"

features/request/Cart/CartUpdate.feature

@@ -20,7 +20,7 @@ Feature: I want to update a cart
     And the variantId is "1" as "int"
     And the quantity is "3" as "int"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -42,7 +42,7 @@ Feature: I want to update a cart
     And the lineItemId is "lineItemId-1"
     And set the quantity to "3" as "int"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -63,7 +63,7 @@ Feature: I want to update a cart
     And the lineItemId is "lineItemId-1"
     And the quantity is "3" as "int"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -87,7 +87,7 @@ Feature: I want to update a cart
     And the slug is "my-custom-line-item"
     And the "taxCategory" is "taxCategory" object
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -123,7 +123,7 @@ Feature: I want to update a cart
     Given i want to "removeCustomLineItem" of "cart"
     And the customLineItemId is "customLineItem-1"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -142,7 +142,7 @@ Feature: I want to update a cart
     Given i want to "setCustomerEmail" of "cart"
     And set the email to "[email protected]"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -161,7 +161,7 @@ Feature: I want to update a cart
     Given i want to "setShippingAddress" of "cart"
     And set the "default" object to "address"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -184,7 +184,7 @@ Feature: I want to update a cart
     Given i want to "setBillingAddress" of "cart"
     And set the "default" object to "address"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -207,7 +207,7 @@ Feature: I want to update a cart
     Given i want to "setCountry" of "cart"
     And set the country to "DE"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -228,7 +228,7 @@ Feature: I want to update a cart
     Given i want to "setCustomerId" of "cart"
     And set the "customerId" to "customer-1"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -247,7 +247,7 @@ Feature: I want to update a cart
     Given i want to "addDiscountCode" of "cart"
     And the "code" is "payless"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -265,7 +265,7 @@ Feature: I want to update a cart
   Scenario: Recalculate cart
     Given i want to "recalculate" of "cart"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -283,7 +283,7 @@ Feature: I want to update a cart
     Given i want to "setShippingMethod" of "cart"
     And set the "shippingMethod" reference "shippingMethod" to "myShippingMethod"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """
@@ -305,7 +305,7 @@ Feature: I want to update a cart
     Given i want to "removeDiscountCode" of "cart"
     And the "discountCode" reference "discountCode" is "payless"
     When i want to update a "Cart"
-    Then the path should be "/carts/id"
+    Then the path should be "carts/id"
     And the method should be "POST"
     And the request should be
     """

features/request/CartDiscount/CartDiscountCreate.feature

@@ -23,7 +23,7 @@ Feature: I want to create a new tax category
 
   Scenario: create a category
     When i want to create a "cartDiscount"
-    Then the path should be "/cart-discounts"
+    Then the path should be "cart-discounts"
     And the method should be "POST"
     And the request should be
     """

features/request/CartDiscount/CartDiscountDelete.feature

@@ -2,5 +2,5 @@ Feature: I want to delete a cart discount
   Scenario: Delete cart discount
     Given a "cartDiscount" is identified by "id" and "version"
     And i want to delete a "CartDiscount"
-    Then the path should be "/cart-discounts/id?version=version"
+    Then the path should be "cart-discounts/id?version=version"
     And the method should be "DELETE"

features/request/CartDiscount/CartDiscountQuery.feature

@@ -2,42 +2,42 @@ Feature: I want to query cartDiscounts
   Scenario: Fetch a cartDiscount by id
     Given a "cartDiscount" is identified by "id"
     Given i want to fetch a "cartDiscount"
-    Then the path should be "/cart-discounts/id"
+    Then the path should be "cart-discounts/id"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "cartDiscounts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "/cart-discounts?where=name%3D%22Peter%22"
+    Then the path should be "cart-discounts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with filter applied
     Given i want to query "cartDiscounts"
     And filter them with criteria 'name="Peter"'
-    Then the path should be "/cart-discounts?where=name%3D%22Peter%22"
+    Then the path should be "cart-discounts?where=name%3D%22Peter%22"
     And the method should be "GET"
 
   Scenario: Query customers with limit
     Given i want to query "cartDiscounts"
     And limit the result to "10"
-    Then the path should be "/cart-discounts?limit=10"
+    Then the path should be "cart-discounts?limit=10"
     And the method should be "GET"
 
   Scenario: Query customers with offset
     Given i want to query "cartDiscounts"
     And offset the result with "10"
-    Then the path should be "/cart-discounts?offset=10"
+    Then the path should be "cart-discounts?offset=10"
     And the method should be "GET"
 
   Scenario: Query customers sorted
     Given i want to query "cartDiscounts"
     And sort them by "name"
-    Then the path should be "/cart-discounts?sort=name"
+    Then the path should be "cart-discounts?sort=name"
     And the method should be "GET"
 
   Scenario: Query parameters should be sorted
     Given i want to query "cartDiscounts"
     And sort them by "name"
     And offset the result with "10"
-    Then the path should be "/cart-discounts?offset=10&sort=name"
+    Then the path should be "cart-discounts?offset=10&sort=name"
     And the method should be "GET"

features/request/CartDiscount/CartDiscountUpdate.feature

@@ -3,7 +3,7 @@ Feature: I want to update a cart discount
     Given a "cartDiscount" is identified by "id" and "version"
   Scenario: Empty update
     Given i want to update a "CartDiscount"
-    Then the path should be "/cart-discounts/id"
+    Then the path should be "cart-discounts/id"
     And the method should be "POST"
     And the request should be
     """

features/request/Category/CategoryCreate.feature

@@ -6,7 +6,7 @@ Feature: I want to create a new category
 
   Scenario: create a category
     When i want to create a "category"
-    Then the path should be "/categories"
+    Then the path should be "categories"
     And the method should be "POST"
     And the request should be
     """