Merge 2.x into 3.x

sonata-project · Jul 13, 2022 · 226ddae · 226ddae
2 parents cba8954 + d2f83a9
commit 226ddae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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/Writer/SitemapWriter.php b/src/Writer/SitemapWriter.php
@@ -267,7 +267,7 @@ private function generateImageLine(array $data): string
             $images .= '<image:image>';
 
             foreach ($image as $key => $element) {
-                $images .= sprintf('<image:%1$s>%2$s</image:%1$s>', ($builder[$key] ?? $key), $element);
+                $images .= sprintf('<image:%1$s>%2$s</image:%1$s>', $builder[$key] ?? $key, $element);
             }
 
             $images .= '</image:image>';
@@ -289,7 +289,7 @@ private function generateVideoLine(array $data): string
         ];
 
         foreach ($data['video'] as $key => $video) {
-            $videos .= sprintf('<video:%1$s>%2$s</video:%1$s>', ($builder[$key] ?? $key), $video);
+            $videos .= sprintf('<video:%1$s>%2$s</video:%1$s>', $builder[$key] ?? $key, $video);
         }
 
         return sprintf('    '.'<url><loc>%s</loc><video:video>%s</video:video></url>'."\n", $data['url'], $videos);