minor #48163 [Yaml] Extract duplicate code to private function (alamirault)

nicolas-grekas · nicolas-grekas · commit adbf678f91e2 · 2022-11-09T14:06:52.000+01:00
This PR was merged into the 6.2 branch. Discussion ---------- [Yaml] Extract duplicate code to private function | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | Fix #...  | License | MIT | Doc PR | symfony/symfony-docs#...  I saw the same code/logic was duplicated in `Inline` class while working on #48127. This little patch can avoid bug/inconsistency Commits ------- 6026422 [Yaml] Extract duplicate code to private function
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -123,13 +123,7 @@ public static function dump(mixed $value, int $flags = 0): string
                 }
 
                 if (Yaml::DUMP_OBJECT_AS_MAP & $flags && ($value instanceof \stdClass || $value instanceof \ArrayObject)) {
-                    $output = [];
-
-                    foreach ($value as $key => $val) {
-                        $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
-                    }
-
-                    return sprintf('{ %s }', implode(', ', $output));
+                    return self::dumpHashArray($value, $flags);
                 }
 
                 if (Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE & $flags) {
@@ -232,7 +226,17 @@ private static function dumpArray(array $value, int $flags): string
             return sprintf('[%s]', implode(', ', $output));
         }
 
-        // hash
+        return self::dumpHashArray($value, $flags);
+    }
+
+    /**
+     * Dumps hash array to a YAML string.
+     *
+     * @param array|\ArrayObject|\stdClass $value The hash array to dump
+     * @param int                          $flags A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
+     */
+    private static function dumpHashArray(array|\ArrayObject|\stdClass $value, int $flags): string
+    {
         $output = [];
         foreach ($value as $key => $val) {
             $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
