From eeb795c7c042247f08cb4ec08b8e4c095051692f Mon Sep 17 00:00:00 2001
From: Bartosz Pietrzak <bartosz.pietrzak1994@gmail.com>
Date: Thu, 5 Apr 2018 11:48:02 +0200
Subject: [PATCH 1/5] willdurand/hateoas 2.12 version update

---
 composer.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 73547a459a5..839efd727d7 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "twig/twig": "^2.0",
         "webmozart/assert": "^1.1",
         "white-october/pagerfanta-bundle": "^1.0.8",
-        "willdurand/hateoas": "^2.10",
+        "willdurand/hateoas": "2.12",
         "willdurand/hateoas-bundle": "^1.2",
         "winzou/state-machine-bundle": "^0.3",
         "zendframework/zend-hydrator": "^2.2",
@@ -137,14 +137,12 @@
         "sylius/ui-bundle": "self.version",
         "sylius/user": "self.version",
         "sylius/user-bundle": "self.version",
-
         "symfony/polyfill-php71": "*",
         "symfony/polyfill-php70": "*",
         "symfony/polyfill-php56": "*"
     },
     "conflict": {
-        "symfony/symfony": "3.4.7 || 4.0.7",
-        "willdurand/hateoas": "^2.11"
+        "symfony/symfony": "3.4.7 || 4.0.7"
     },
     "suggest": {
         "ext-iconv": "For better performance than using Symfony Polyfill Component",

From 15d97d0bc354e67f8fb72b57985a0346ff329158 Mon Sep 17 00:00:00 2001
From: Bartosz Pietrzak <bartosz.pietrzak1994@gmail.com>
Date: Tue, 10 Apr 2018 09:56:54 +0200
Subject: [PATCH 2/5] WIP

---
 composer.json    | 2 +-
 phpunit.xml.dist | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 839efd727d7..8a1b395b63f 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "twig/twig": "^2.0",
         "webmozart/assert": "^1.1",
         "white-october/pagerfanta-bundle": "^1.0.8",
-        "willdurand/hateoas": "2.12",
+        "willdurand/hateoas": "2.11",
         "willdurand/hateoas-bundle": "^1.2",
         "winzou/state-machine-bundle": "^0.3",
         "zendframework/zend-hydrator": "^2.2",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6449c760d21..03232813081 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,6 +13,7 @@
 
     <php>
         <server name="KERNEL_CLASS_PATH" value="/app/TestAppKernel.php" />
+        <server name="KERNEL_DIR" value="app" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
     </php>
 </phpunit>

From 64bf78f1cdf15ea3b8fe21235520fc011b320038 Mon Sep 17 00:00:00 2001
From: Bartosz Pietrzak <bartosz.pietrzak1994@gmail.com>
Date: Tue, 10 Apr 2018 11:45:59 +0200
Subject: [PATCH 3/5] Expected response scheme fixes after hateoas package
 update

---
 composer.json                                 |  2 +-
 .../Expected/taxon/index_response.json        | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 8a1b395b63f..f6805b22e6f 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "twig/twig": "^2.0",
         "webmozart/assert": "^1.1",
         "white-october/pagerfanta-bundle": "^1.0.8",
-        "willdurand/hateoas": "2.11",
+        "willdurand/hateoas": "^2.12",
         "willdurand/hateoas-bundle": "^1.2",
         "winzou/state-machine-bundle": "^0.3",
         "zendframework/zend-hydrator": "^2.2",
diff --git a/tests/Responses/Expected/taxon/index_response.json b/tests/Responses/Expected/taxon/index_response.json
index 74cfd432ebb..1d13bbfc47b 100644
--- a/tests/Responses/Expected/taxon/index_response.json
+++ b/tests/Responses/Expected/taxon/index_response.json
@@ -39,7 +39,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -51,7 +51,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -79,7 +79,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -91,7 +91,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -119,7 +119,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -131,7 +131,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -159,7 +159,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -171,7 +171,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -199,7 +199,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -210,8 +210,10 @@
                 "parent": {
                     "id": @integer@,
                     "code": "t-shirts",
+                    "root": @array@,
+                    "parent": @array@,
                     "position": 3,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -239,7 +241,7 @@
                     "id": @integer@,
                     "code": "category",
                     "position": 0,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {
@@ -250,8 +252,10 @@
                 "parent": {
                     "id": @integer@,
                     "code": "t-shirts",
+                    "root": @array@,
+                    "parent": @array@,
                     "position": 3,
-                    "translations": [],
+                    "translations": @array@,
                     "images": [],
                     "_links": {
                         "self": {

From fc67cf9d5f505c73743d0ab197a49fc59fe9e80a Mon Sep 17 00:00:00 2001
From: Bartosz Pietrzak <bartosz.pietrzak1994@gmail.com>
Date: Tue, 10 Apr 2018 12:07:02 +0200
Subject: [PATCH 4/5] Unnecessary file removal

---
 phpunit.xml.dist | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 phpunit.xml.dist

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 03232813081..00000000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Sylius Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <php>
-        <server name="KERNEL_CLASS_PATH" value="/app/TestAppKernel.php" />
-        <server name="KERNEL_DIR" value="app" />
-        <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
-    </php>
-</phpunit>

From 6883689bbb070cd3078d8945155d524b86359009 Mon Sep 17 00:00:00 2001
From: Bartosz Pietrzak <bartosz.pietrzak1994@gmail.com>
Date: Tue, 10 Apr 2018 14:12:13 +0200
Subject: [PATCH 5/5] Revert "Unnecessary file removal"

---
 phpunit.xml.dist | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 phpunit.xml.dist

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000000..6449c760d21
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.6/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="Sylius Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <php>
+        <server name="KERNEL_CLASS_PATH" value="/app/TestAppKernel.php" />
+        <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
+    </php>
+</phpunit>