Merge branch 'release/2.0' into release/2.1

sulu · Sep 9, 2020 · 40fa173 · 40fa173
2 parents b77e3d8 + b506e82
commit 40fa173
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "ext-dom": "*",
         "ext-json": "*",
         "ext-simplexml": "*",
+        "composer/package-versions-deprecated": "^1.8",
         "contao/imagine-svg": "^0.2.2 || ^1.0",
         "dantleech/phpcr-migrations-bundle": "^1.0",
         "doctrine/annotations": "^1.2",

diff --git a/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md b/src/Sulu/Bundle/AdminBundle/Resources/js/components/Form/README.md
@@ -13,16 +13,22 @@ const types = [
 const [type, setType] = React.useState('work');
 
 <Form>
-    <Form.Section label="Section 1" size={3}>
+    <Form.Section label="Section 1" colSpan={3}>
         <Form.Field label="Author" onTypeChange={setType} types={types} type={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">

diff --git 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();
         }