From c606ff4de69410e4bff6f2e10f9cc2dfec7420fe Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Wed, 26 Aug 2020 14:57:25 +0200
Subject: [PATCH 1/3] Fix composer 2 compatibility for php 7.3 and lower
 (#5357)

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 2d2f2308b62..1b1b5168eb6 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,7 @@
         "ext-dom": "*",
         "ext-json": "*",
         "ext-simplexml": "*",
+        "composer/package-versions-deprecated": "^1.8",
         "dantleech/phpcr-migrations-bundle": "^1.0",
         "doctrine/annotations": "^1.2",
         "doctrine/common": "^2.7.1",

From 7071e471bef3ab4ad84ae061fb79fa35badf175a Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Tue, 1 Sep 2020 10:57:35 +0200
Subject: [PATCH 2/3] Fix user refresh on test user provider (#5475)

---
 src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php b/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php
index 97982764fcd..7df8ac694d2 100644
--- a/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php
+++ b/src/Sulu/Bundle/TestBundle/Testing/TestUserProvider.php
@@ -141,7 +141,7 @@ public function loadUserByUsername($username)
      */
     public function refreshUser(UserInterface $user)
     {
-        if (self::TEST_USER_USERNAME === $this->getUser()->getUsername()) {
+        if (self::TEST_USER_USERNAME === $user->getUsername()) {
             return $this->getUser();
         }
 

From b506e82283850e2ea191a287f5098c0b4ffc2475 Mon Sep 17 00:00:00 2001
From: Daniel Rotter <daniel.rotter@gmail.com>
Date: Wed, 2 Sep 2020 10:29:33 +0200
Subject: [PATCH 3/3] Replace obsolete size property with colSpan in Form
 documentation (#5477)

---
 .../Resources/js/components/Form/README.md         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md b/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md
index 23ffdb5e9d7..308b766e0ce 100644
--- a/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md
+++ b/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md
@@ -19,16 +19,22 @@ const handleTypeChange = (type) => {
 };
 
 <Form>
-    <Form.Section label="Section 1" size={3}>
+    <Form.Section label="Section 1" colSpan={3}>
         <Form.Field label="Author" onTypeChange={handleTypeChange} types={types} type={state.type}>
             <input type="text" style={{width: '100%'}} />
         </Form.Field>
     </Form.Section>
-    <Form.Section label="Section 2" size={9}>
-        <Form.Field description="This is the title" label="Title" required={true} size={3}>
+    <Form.Section label="Section 2" colSpan={9}>
+        <Form.Field description="This is the title" label="Title" required={true} colSpan={3}>
             <input type="text" style={{width: '100%'}} />
         </Form.Field>
-        <Form.Field description="This is the second title" error="Error!" label="Second title" required={true} size={9}>
+        <Form.Field
+            description="This is the second title"
+            error="Error!"
+            label="Second title"
+            required={true}
+            colSpan={9}
+        >
             <input type="text" style={{width: '100%'}} />
         </Form.Field>
         <Form.Field description="Article" label="Article">