DevKit updates for 4.x branch (#8166)

Co-authored-by: Vincent Langlet <[email protected]>
sonata-project · Apr 3, 2024 · 247131e · 247131e
1 parent fb06e46
commit 247131e
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 33 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -45,7 +45,7 @@
     'no_useless_return' => true,
     'no_superfluous_elseif' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
-    'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
+    'nullable_type_declaration_for_default_null_value' => true,
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
     'phpdoc_order' => ['order' => ['var', 'param', 'throws', 'return', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return']],

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -176,7 +176,7 @@ Frontend assets are all located under `assets` directory, with the following str
 * `assets/images` for the images
 * `assets/vendor` for the third party assets that can't be loaded via [NPM](https://www.npmjs.com/)
 
-This `assets` directory contains only the source code, and it is not directly accesible for the
+This `assets` directory contains only the source code, and it is not directly accessible for the
 website, because is not placed under the `src/Resources/public`.
 
 If you take a look at the `src/Resources/public` you will see a lot of minified assets, this is done with

diff --git a/src/Action/SetObjectFieldValueAction.php b/src/Action/SetObjectFieldValueAction.php
@@ -160,6 +160,7 @@ public function __invoke(Request $request): JsonResponse
             return new JsonResponse(implode("\n", $messages), Response::HTTP_BAD_REQUEST);
         }
 
+        \assert(\is_object($object));
         $admin->update($object);
 
         // render the widget

diff --git a/tests/Form/AdminLayoutTest.php b/tests/Form/AdminLayoutTest.php
@@ -43,8 +43,8 @@ public function testLabelWithoutTranslation(): void
             TextType::class,
             null,
             [
-            'translation_domain' => false,
-        ]
+                'translation_domain' => false,
+            ]
         );
         $html = $this->renderLabel($form->createView());
 
@@ -65,8 +65,8 @@ public function testLabelWithCustomTranslationDomain(): void
             TextType::class,
             null,
             [
-            'translation_domain' => 'custom_domain',
-        ]
+                'translation_domain' => 'custom_domain',
+            ]
         );
         $html = $this->renderLabel($form->createView());
 

diff --git a/tests/Form/FormMapperTest.php b/tests/Form/FormMapperTest.php
@@ -175,7 +175,8 @@ public function testWithFieldsCascadeTranslationDomain(): void
             ->method('getDefaultOptions')
             ->willReturn([]);
 
-        $this->formMapper->with('foobar', [
+        $this->formMapper
+            ->with('foobar', [
                 'translation_domain' => 'Foobar',
             ])
             ->add('foo', TextType::class)

diff --git a/tests/Twig/Extension/RenderElementExtensionTest.php b/tests/Twig/Extension/RenderElementExtensionTest.php
@@ -864,7 +864,7 @@ class="x-editable"
                         </span>
                     </td>
                     EOT
-            ,
+                ,
                 FieldDescriptionInterface::TYPE_BOOLEAN,
                 true,
                 ['editable' => true],
@@ -1314,7 +1314,7 @@ class="x-editable"
                 FieldDescriptionInterface::TYPE_URL,
                 'http://foo/bar?a=b&c=123456789',
                 ['route' => ['name' => 'sonata_admin_foo'],
-                'hide_protocol' => true, ],
+                    'hide_protocol' => true, ],
             ],
             [
                 '<td class="sonata-ba-list-field sonata-ba-list-field-url" objectId="12345">
@@ -1335,7 +1335,7 @@ class="x-editable"
                 'Foo',
                 [
                     'route' => ['name' => 'sonata_admin_foo_param',
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
                 ],
             ],
             [
@@ -1345,9 +1345,11 @@ class="x-editable"
                 FieldDescriptionInterface::TYPE_URL,
                 'Foo',
                 [
-                    'route' => ['name' => 'sonata_admin_foo_param',
-                    'absolute' => true,
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
+                    'route' => [
+                        'name' => 'sonata_admin_foo_param',
+                        'absolute' => true,
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
+                    ],
                 ],
             ],
             [
@@ -1357,9 +1359,11 @@ class="x-editable"
                 FieldDescriptionInterface::TYPE_URL,
                 'Foo',
                 [
-                    'route' => ['name' => 'sonata_admin_foo_object',
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
-                    'identifier_parameter_name' => 'barId', ],
+                    'route' => [
+                        'name' => 'sonata_admin_foo_object',
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
+                        'identifier_parameter_name' => 'barId',
+                    ],
                 ],
             ],
             [
@@ -1369,10 +1373,12 @@ class="x-editable"
                 FieldDescriptionInterface::TYPE_URL,
                 'Foo',
                 [
-                    'route' => ['name' => 'sonata_admin_foo_object',
-                    'absolute' => true,
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
-                    'identifier_parameter_name' => 'barId', ],
+                    'route' => [
+                        'name' => 'sonata_admin_foo_object',
+                        'absolute' => true,
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
+                        'identifier_parameter_name' => 'barId',
+                    ],
                 ],
             ],
             [
@@ -1794,8 +1800,7 @@ public function provideRenderViewElementCases(): iterable
                 '<th>Data</th> <td><a href="https://example.com">https://example.com</a></td>',
                 FieldDescriptionInterface::TYPE_URL,
                 'https://example.com',
-                ['safe' => false,
-                'hide_protocol' => false, ],
+                ['safe' => false, 'hide_protocol' => false],
             ],
             [
                 '<th>Data</th> <td><a href="http://example.com">Foo</a></td>',

diff --git a/tests/Twig/RenderElementRuntimeTest.php b/tests/Twig/RenderElementRuntimeTest.php
@@ -829,7 +829,7 @@ class="x-editable"
                         </span>
                     </td>
                     EOT
-            ,
+                ,
                 FieldDescriptionInterface::TYPE_BOOLEAN,
                 true,
                 ['editable' => true],
@@ -1279,7 +1279,7 @@ class="x-editable"
                 FieldDescriptionInterface::TYPE_URL,
                 'http://foo/bar?a=b&c=123456789',
                 ['route' => ['name' => 'sonata_admin_foo'],
-                'hide_protocol' => true, ],
+                    'hide_protocol' => true, ],
             ],
             [
                 '<td class="sonata-ba-list-field sonata-ba-list-field-url" objectId="12345">
@@ -1300,7 +1300,7 @@ class="x-editable"
                 'Foo',
                 [
                     'route' => ['name' => 'sonata_admin_foo_param',
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
                 ],
             ],
             [
@@ -1311,8 +1311,8 @@ class="x-editable"
                 'Foo',
                 [
                     'route' => ['name' => 'sonata_admin_foo_param',
-                    'absolute' => true,
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
+                        'absolute' => true,
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'], ],
                 ],
             ],
             [
@@ -1323,8 +1323,8 @@ class="x-editable"
                 'Foo',
                 [
                     'route' => ['name' => 'sonata_admin_foo_object',
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
-                    'identifier_parameter_name' => 'barId', ],
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
+                        'identifier_parameter_name' => 'barId', ],
                 ],
             ],
             [
@@ -1335,9 +1335,9 @@ class="x-editable"
                 'Foo',
                 [
                     'route' => ['name' => 'sonata_admin_foo_object',
-                    'absolute' => true,
-                    'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
-                    'identifier_parameter_name' => 'barId', ],
+                        'absolute' => true,
+                        'parameters' => ['param1' => 'abcd', 'param2' => 'efgh', 'param3' => 'ijkl'],
+                        'identifier_parameter_name' => 'barId', ],
                 ],
             ],
             [
@@ -1734,7 +1734,7 @@ public function provideRenderViewElementCases(): iterable
             FieldDescriptionInterface::TYPE_URL,
             'https://example.com',
             ['safe' => false,
-            'hide_protocol' => false, ],
+                'hide_protocol' => false, ],
         ];
         yield [
             '<th>Data</th> <td><a href="http://example.com">Foo</a></td>',