Merge branch 1.8

Conflicts:
	Negotiation/FormatNegotiator.php
	Resources/config/body_listener.xml
	Resources/config/util.xml
	Resources/doc/3-listener-support.rst
	Resources/doc/format_listener.rst
	Tests/EventListener/FormatListenerTest.php
	Tests/EventListener/MimeTypeListenerTest.php
	Tests/Negotiation/FormatNegotiatorTest.php
	Tests/Routing/Loader/LoaderTest.php
	Tests/Validator/ViolationFormatterTest.php
	Util/FormatNegotiator.php
	Util/MediaTypeNegotiatorInterface.php
	Validator/ViolationFormatter.php
	Version/VersionResolverInterface.php

Normalizer/CamelKeysNormalizer.php

@@ -69,14 +69,23 @@ private function normalizeArray(array &$data)
      *
      * @return string
      */
-    private function normalizeString($string)
+    protected function normalizeString($string)
     {
         if (false === strpos($string, '_')) {
             return $string;
         }
 
-        return preg_replace_callback('/_([a-zA-Z0-9])/', function ($matches) {
+        if (preg_match('/^(_+)(.*)/', $string, $matches)) {
+            $underscorePrefix = $matches[1];
+            $string = $matches[2];
+        } else {
+            $underscorePrefix = '';
+        }
+
+        $string = preg_replace_callback('/_([a-zA-Z0-9])/', function ($matches) {
             return strtoupper($matches[1]);
         }, $string);
+
+        return $underscorePrefix.$string;
     }
 }

Normalizer/CamelKeysNormalizerWithLeadingUnderscore.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\RestBundle\Normalizer;
+
+/**
+ * Normalizes the array by changing its keys from underscore to camel case, while
+ * leaving leading underscores unchanged.
+ *
+ * @author Lukas Kahwe Smith <smith@pooteeweet.org>
+ */
+class CamelKeysNormalizerWithLeadingUnderscore extends CamelKeysNormalizer
+{
+    /**
+     * Normalizes a string while leaving leading underscores unchanged.
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    protected function normalizeString($string)
+    {
+        if (false === strpos($string, '_')) {
+            return $string;
+        }
+
+        $offset = strspn($string, '_');
+        if ($offset) {
+            $underscorePrefix = substr($string, 0, $offset);
+            $string = substr($string, $offset);
+        } else {
+            $underscorePrefix = '';
+        }
+
+        return $underscorePrefix.parent::normalizeString($string);
+    }
+}

Resources/config/body_listener.xml

@@ -8,6 +8,8 @@
 
         <service id="fos_rest.normalizer.camel_keys" class="FOS\RestBundle\Normalizer\CamelKeysNormalizer" />
 
+        <service id="fos_rest.normalizer.camel_keys_with_leading_underscore" class="FOS\RestBundle\Normalizer\CamelKeysNormalizerWithLeadingUnderscore" />
+
         <service id="fos_rest.decoder.json" class="FOS\RestBundle\Decoder\JsonDecoder" />
 
         <service id="fos_rest.decoder.jsontoform" class="FOS\RestBundle\Decoder\JsonToFormDecoder" />

Resources/doc/3-listener-support.rst

@@ -21,7 +21,10 @@ to enable a few additional listeners:
     fos_rest:
         param_fetcher_listener: true
         body_listener: true
-        format_listener: true
+        format_listener:
+            enabled: true
+            rules:
+                - { path: '^/', priorities: ['json', 'xml'], fallback_format: 'html' }
         versioning: true
         view:
             view_response_listener: 'force'

Resources/doc/body_listener.rst

@@ -56,6 +56,11 @@ to camel cased ones, you can use the ``camel_keys`` array normalizer:
         body_listener:
             array_normalizer: fos_rest.normalizer.camel_keys
 
+.. note::
+
+    If you want to ignore leading underscores, for example in ``_username`` you can
+    instead use the ``fos_rest.normalizer.camel_keys_with_leading_underscore`` service.
+
 Sometimes an array contains a key, which once normalized, will override an
 existing array key. For example ``foo_bar`` and ``foo_Bar`` will both lead to
 ``fooBar``. If the normalizer receives this data, the listener will throw a

Resources/doc/format_listener.rst

@@ -27,6 +27,7 @@ Setting ``priorities`` to a non-empty array enables Accept header negotiations.
     # app/config/config.yml
     fos_rest:
         format_listener:
+            enabled: true
             rules:
                 # setting fallback_format to json means that instead of considering the next rule in case of a priority mismatch, json will be used
                 - { path: '^/', host: 'api.%domain%', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
@@ -102,6 +103,7 @@ format will remain unchanged.
     # app/config/config.yml
     fos_rest:
         format_listener:
+            enabled: true
             rules:
                 - { path: '^/api', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
                 - { path: '^/', stop: true } # Available for version >= 1.5

Tests/Normalizer/CamelKeysNormalizerTest.php

@@ -12,6 +12,7 @@
 namespace FOS\RestBundle\Tests\Normalizer;
 
 use FOS\RestBundle\Normalizer\CamelKeysNormalizer;
+use FOS\RestBundle\Normalizer\CamelKeysNormalizerWithLeadingUnderscore;
 
 class CamelKeysNormalizerTest extends \PHPUnit_Framework_TestCase
 {
@@ -52,4 +53,21 @@ public function normalizeProvider()
             ],
         ];
     }
+
+    /**
+     * @dataProvider normalizeProvider
+     */
+    public function testNormalizeLeadingUnderscore(array $array, array $expected)
+    {
+        $normalizer = new CamelKeysNormalizerWithLeadingUnderscore();
+        $this->assertEquals($expected, $normalizer->normalize($array));
+    }
+
+    public function normalizeProviderLeadingUnderscore()
+    {
+        $array = $this->normalizeProvider();
+        $array[] = array(array('__username' => 'foo', '_password' => 'bar', '_foo_bar' => 'foobar'), array('__username' => 'foo', '_password' => 'bar', '_fooBar' => 'foobar'));
+
+        return $array;
+    }
 }