Merge branch '2.3' into 2.5

* 2.3:
  Configure firewall's kernel exception listener with configured entry point or a default entry point
  PSR-2 fixes
  [DependencyInjection] make paths relative to __DIR__ in the generated container
  Fixed the syntax of a composer.json file
  Fixed the symfony/config version constraint
  Tweaked the password-compat version constraint
  Docblock fixes
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	composer.json
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Tests/Helper/HelperSetTest.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpFoundation/StreamedResponse.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Stopwatch/StopwatchPeriod.php
	src/Symfony/Component/Templating/PhpEngine.php
	src/Symfony/Component/Templating/TemplateReference.php
	src/Symfony/Component/Templating/TemplateReferenceInterface.php
	src/Symfony/Component/Translation/TranslatorInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php

Author: fabpot

Encoder/DecoderInterface.php

@@ -23,9 +23,9 @@ interface DecoderInterface
     /**
      * Decodes a string into PHP data.
      *
-     * @param scalar $data      Data to decode
-     * @param string $format    Format name
-     * @param array  $context   options that decoders have access to.
+     * @param scalar $data    Data to decode
+     * @param string $format  Format name
+     * @param array  $context options that decoders have access to.
      *
      * The format parameter specifies which format the data is in; valid values
      * depend on the specific implementation. Authors implementing this interface

Encoder/EncoderInterface.php

@@ -23,8 +23,8 @@ interface EncoderInterface
     /**
      * Encodes data into the given format
      *
-     * @param mixed  $data   Data to encode
-     * @param string $format Format name
+     * @param mixed  $data    Data to encode
+     * @param string $format  Format name
      * @param array  $context options that normalizers/encoders have access to.
      *
      * @return scalar

Encoder/JsonDecode.php

@@ -41,8 +41,8 @@ class JsonDecode implements DecoderInterface
     /**
      * Constructs a new JsonDecode instance.
      *
-     * @param bool     $associative True to return the result associative array, false for a nested stdClass hierarchy
-     * @param int      $depth       Specifies the recursion depth
+     * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy
+     * @param int  $depth       Specifies the recursion depth
      */
     public function __construct($associative = false, $depth = 512)
     {

Encoder/JsonEncode.php

@@ -72,6 +72,7 @@ public function supportsEncoding($format)
      * Merge default json encode options with context.
      *
      * @param array $context
+     *
      * @return array
      */
     private function resolveContext(array $context = array())

Normalizer/DenormalizableInterface.php

@@ -28,11 +28,11 @@ interface DenormalizableInterface
      * recursively all child objects of the implementor.
      *
      * @param DenormalizerInterface $denormalizer The denormalizer is given so that you
-     *   can use it to denormalize objects contained within this object.
-     * @param array|scalar $data   The data from which to re-create the object.
-     * @param string|null  $format The format is optionally given to be able to denormalize differently
-     *   based on different input formats.
-     * @param array        $context options for denormalizing
+     *                                            can use it to denormalize objects contained within this object.
+     * @param array|scalar          $data         The data from which to re-create the object.
+     * @param string|null           $format       The format is optionally given to be able to denormalize differently
+     *                                            based on different input formats.
+     * @param array                 $context      options for denormalizing
      */
     public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
 }

Normalizer/DenormalizerInterface.php

@@ -21,9 +21,9 @@ interface DenormalizerInterface
     /**
      * Denormalizes data back into an object of the given class
      *
-     * @param mixed  $data   data to restore
-     * @param string $class  the expected class to instantiate
-     * @param string $format format the given data was extracted from
+     * @param mixed  $data    data to restore
+     * @param string $class   the expected class to instantiate
+     * @param string $format  format the given data was extracted from
      * @param array  $context options available to the denormalizer
      *
      * @return object

Normalizer/GetSetMethodNormalizer.php

@@ -188,6 +188,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
      * returns attribute name in camelcase format
      *
      * @param string $attributeName
+     *
      * @return string
      */
     protected function formatAttribute($attributeName)

Normalizer/NormalizableInterface.php

@@ -28,10 +28,10 @@ interface NormalizableInterface
      * recursively all child objects of the implementor.
      *
      * @param NormalizerInterface $normalizer The normalizer is given so that you
-     *   can use it to normalize objects contained within this object.
-     * @param string|null $format The format is optionally given to be able to normalize differently
-     *   based on different output formats.
-     * @param array $context Options for normalizing this object
+     *                                        can use it to normalize objects contained within this object.
+     * @param string|null         $format     The format is optionally given to be able to normalize differently
+     *                                        based on different output formats.
+     * @param array               $context    Options for normalizing this object
      *
      * @return array|scalar
      */

Normalizer/NormalizerInterface.php

@@ -21,9 +21,9 @@ interface NormalizerInterface
     /**
      * Normalizes an object into a set of arrays/scalars
      *
-     * @param object $object object to normalize
-     * @param string $format format the normalization result will be encoded as
-     * @param array $context Context options for the normalizer
+     * @param object $object  object to normalize
+     * @param string $format  format the normalization result will be encoded as
+     * @param array  $context Context options for the normalizer
      *
      * @return array|scalar
      */

Serializer.php

@@ -221,9 +221,9 @@ final public function decode($data, $format, array $context = array())
     /**
      * Normalizes an object into a set of arrays/scalars
      *
-     * @param object $object object to normalize
-     * @param string $format format name, present to give the option to normalizers to act differently based on formats
-     * @param array $context The context data for this particular normalization
+     * @param object $object  object to normalize
+     * @param string $format  format name, present to give the option to normalizers to act differently based on formats
+     * @param array  $context The context data for this particular normalization
      *
      * @return array|scalar
      *
@@ -245,10 +245,10 @@ private function normalizeObject($object, $format, array $context = array())
     /**
      * Denormalizes data back into an object of the given class
      *
-     * @param mixed  $data   data to restore
-     * @param string $class  the expected class to instantiate
-     * @param string $format format name, present to give the option to normalizers to act differently based on formats
-     * @param array $context The context data for this particular denormalization
+     * @param mixed  $data    data to restore
+     * @param string $class   the expected class to instantiate
+     * @param string $format  format name, present to give the option to normalizers to act differently based on formats
+     * @param array  $context The context data for this particular denormalization
      *
      * @return object
      *