Merge 4.x into 5.x

sonata-project · Jul 13, 2022 · b864b78 · b864b78
2 parents 7fb1c6a + 4899340
commit b864b78
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -52,7 +52,7 @@
     'no_useless_return' => true,
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
-    'ordered_imports' => true,
+    'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
     'php_unit_method_casing' => false,
     'php_unit_set_up_tear_down_visibility' => true,
     'php_unit_strict' => true,

diff --git a/src/Resources/config/providers.php b/src/Resources/config/providers.php
@@ -90,7 +90,7 @@
                 '',
                 new ReferenceConfigurator('sonata.media.thumbnail.format'),
                 new ReferenceConfigurator('sonata.media.http.client'),
-                (new ReferenceConfigurator('sonata.media.http.message_factory')),
+                new ReferenceConfigurator('sonata.media.http.message_factory'),
                 new ReferenceConfigurator('sonata.media.metadata.proxy'),
                 '',
             ])