symfony
diff --git a/‎src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
Lines changed: 9 additions & 3 deletions b/‎src/Symfony/Component/Serializer/Encoder/CsvEncoder.php
Lines changed: 9 additions & 3 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
Lines changed: 20 additions & 0 deletions b/‎src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
Lines changed: 20 additions & 0 deletions
@@ -25,6 +25,7 @@ class CsvEncoder implements EncoderInterface, DecoderInterface
     const ENCLOSURE_KEY = 'csv_enclosure';
     const ESCAPE_CHAR_KEY = 'csv_escape_char';
     const KEY_SEPARATOR_KEY = 'csv_key_separator';
+    const HEADERS_KEY = 'csv_headers';
 
     private $delimiter;
     private $enclosure;
@@ -69,7 +70,7 @@ public function encode($data, $format, array $context = array())
             }
         }
 
-        list($delimiter, $enclosure, $escapeChar, $keySeparator) = $this->getCsvOptions($context);
+        list($delimiter, $enclosure, $escapeChar, $keySeparator, $headers) = $this->getCsvOptions($context);
 
         foreach ($data as &$value) {
             $flattened = array();
@@ -78,7 +79,7 @@ public function encode($data, $format, array $context = array())
         }
         unset($value);
 
-        $headers = $this->extractHeaders($data);
+        $headers = array_merge(array_values($headers), array_diff($this->extractHeaders($data), $headers));
 
         fputcsv($handle, $headers, $delimiter, $enclosure, $escapeChar);
 
@@ -195,8 +196,13 @@ protected function getCsvOptions(array $context)
         $enclosure = isset($context[self::ENCLOSURE_KEY]) ? $context[self::ENCLOSURE_KEY] : $this->enclosure;
         $escapeChar = isset($context[self::ESCAPE_CHAR_KEY]) ? $context[self::ESCAPE_CHAR_KEY] : $this->escapeChar;
         $keySeparator = isset($context[self::KEY_SEPARATOR_KEY]) ? $context[self::KEY_SEPARATOR_KEY] : $this->keySeparator;
+        $headers = isset($context[self::HEADERS_KEY]) ? $context[self::HEADERS_KEY] : array();
+
+        if (!is_array($headers)) {
+            throw new InvalidArgumentException(sprintf('The "%s" context variable must be an array or null, given "%s".', self::HEADERS_KEY, gettype($headers)));
+        }
 
-        return array($delimiter, $enclosure, $escapeChar, $keySeparator);
+        return array($delimiter, $enclosure, $escapeChar, $keySeparator, $headers);
     }
 
     /**
 
@@ -153,6 +153,26 @@ public function testEncodeVariableStructure()
         $this->assertEquals($csv, $this->encoder->encode($value, 'csv'));
     }
 
+    public function testEncodeCustomHeaders()
+    {
+        $context = array(
+            CsvEncoder::HEADERS_KEY => array(
+                'b',
+                'c',
+            ),
+        );
+        $value = array(
+            array('a' => 'foo', 'b' => 'bar'),
+        );
+        $csv = <<<CSV
+b,c,a
+bar,,foo
+
+CSV;
+
+        $this->assertEquals($csv, $this->encoder->encode($value, 'csv', $context));
+    }
+
     public function testSupportsDecoding()
     {
         $this->assertTrue($this->encoder->supportsDecoding('csv'));