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

Constraint.php

@@ -209,7 +209,7 @@ public function validatedBy()
      * This method should return one or more of the constants
      * Constraint::CLASS_CONSTRAINT and Constraint::PROPERTY_CONSTRAINT.
      *
-     * @return string|array  One or more constant values
+     * @return string|array One or more constant values
      *
      * @api
      */

ConstraintViolation.php

@@ -61,19 +61,19 @@ class ConstraintViolation implements ConstraintViolationInterface
     /**
      * Creates a new constraint violation.
      *
-     * @param string       $message         The violation message
-     * @param string       $messageTemplate The raw violation message
-     * @param array        $parameters      The parameters to substitute in the
-     *                                      raw violation message
-     * @param mixed        $root            The value originally passed to the
-     *                                      validator
-     * @param string       $propertyPath    The property path from the root
-     *                                      value to the invalid value
-     * @param mixed        $invalidValue    The invalid value that caused this
-     *                                      violation
-     * @param int|null     $plural          The number for determining the plural
-     *                                      form when translating the message
-     * @param mixed        $code            The error code of the violation
+     * @param string   $message         The violation message
+     * @param string   $messageTemplate The raw violation message
+     * @param array    $parameters      The parameters to substitute in the
+     *                                  raw violation message
+     * @param mixed    $root            The value originally passed to the
+     *                                  validator
+     * @param string   $propertyPath    The property path from the root
+     *                                  value to the invalid value
+     * @param mixed    $invalidValue    The invalid value that caused this
+     *                                  violation
+     * @param int|null $plural          The number for determining the plural
+     *                                  form when translating the message
+     * @param mixed    $code            The error code of the violation
      */
     public function __construct($message, $messageTemplate, array $parameters, $root, $propertyPath, $invalidValue, $plural = null, $code = null)
     {

ConstraintViolationInterface.php

@@ -85,7 +85,7 @@ public function getMessageParameters();
      * This method returns the value of the parameter for choosing the right
      * pluralization form (in this case "choices").
      *
-     * @return int|null     The number to use to pluralize of the message.
+     * @return int|null The number to use to pluralize of the message.
      */
     public function getMessagePluralization();
 

ConstraintViolationListInterface.php

@@ -41,7 +41,7 @@ public function addAll(ConstraintViolationListInterface $otherList);
     /**
      * Returns the violation at a given offset.
      *
-     * @param  int     $offset The offset of the violation.
+     * @param int $offset The offset of the violation.
      *
      * @return ConstraintViolationInterface The violation.
      *
@@ -54,9 +54,9 @@ public function get($offset);
     /**
      * Returns whether the given offset exists.
      *
-     * @param  int     $offset The violation offset.
+     * @param int $offset The violation offset.
      *
-     * @return bool    Whether the offset exists.
+     * @return bool Whether the offset exists.
      *
      * @api
      */
@@ -75,7 +75,7 @@ public function set($offset, ConstraintViolationInterface $violation);
     /**
      * Removes a violation at a given offset.
      *
-     * @param int     $offset The offset to remove.
+     * @param int $offset The offset to remove.
      *
      * @api
      */

Constraints/AbstractComparisonValidator.php

@@ -50,10 +50,10 @@ public function validate($value, Constraint $constraint)
     /**
      * Compares the two given values to find if their relationship is valid
      *
-     * @param mixed      $value1     The first value to compare
-     * @param mixed      $value2     The second value to compare
+     * @param mixed $value1 The first value to compare
+     * @param mixed $value2 The second value to compare
      *
-     * @return bool    true if the relationship is valid, false otherwise
+     * @return bool true if the relationship is valid, false otherwise
      */
     abstract protected function compareValues($value1, $value2);
 }

Constraints/CardSchemeValidator.php

@@ -101,7 +101,7 @@ class CardSchemeValidator extends ConstraintValidator
     /**
      * Validates a creditcard belongs to a specified scheme.
      *
-     * @param mixed $value
+     * @param mixed      $value
      * @param Constraint $constraint
      */
     public function validate($value, Constraint $constraint)

DefaultTranslator.php

@@ -117,11 +117,11 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
      *
      *     // -> These are 3 donkeys.
      *
-     * @param string  $id         The message id
-     * @param int     $number     The number to use to find the index of the message
-     * @param array   $parameters An array of parameters for the message
-     * @param string  $domain     Ignored
-     * @param string  $locale     Ignored
+     * @param string $id         The message id
+     * @param int    $number     The number to use to find the index of the message
+     * @param array  $parameters An array of parameters for the message
+     * @param string $domain     Ignored
+     * @param string $locale     Ignored
      *
      * @return string The translated string
      *

ExecutionContextInterface.php

@@ -109,12 +109,12 @@ public function addViolation($message, array $params = array(), $invalidValue =
      * Adds a violation at the validation graph node with the given property
      * path relative to the current property path.
      *
-     * @param string   $subPath       The relative property path for the violation
-     * @param string   $message       The error message
-     * @param array    $parameters    The parameters substituted in the error message
-     * @param mixed    $invalidValue  The invalid, validated value
-     * @param int|null $plural        The number to use to pluralize of the message
-     * @param int|null $code          The violation code
+     * @param string   $subPath      The relative property path for the violation
+     * @param string   $message      The error message
+     * @param array    $parameters   The parameters substituted in the error message
+     * @param mixed    $invalidValue The invalid, validated value
+     * @param int|null $plural       The number to use to pluralize of the message
+     * @param int|null $code         The violation code
      *
      * @api
      *

Mapping/ClassMetadata.php

@@ -207,7 +207,7 @@ public function getClassName()
      * will validate the group sequence. The constraints assigned to "Default"
      * can still be validated by validating the class in "<ClassName>".
      *
-     * @return string  The name of the default group
+     * @return string The name of the default group
      */
     public function getDefaultGroup()
     {
@@ -469,7 +469,7 @@ public function getReflectionClass()
     /**
      * Sets whether a group sequence provider should be used.
      *
-     * @param bool    $active
+     * @param bool $active
      *
      * @throws GroupDefinitionException
      */

Mapping/Loader/AbstractLoader.php

@@ -36,10 +36,10 @@ protected function addNamespaceAlias($alias, $namespace)
     /**
      * Creates a new constraint instance for the given constraint name.
      *
-     * @param string $name   The constraint name. Either a constraint relative
-     *                       to the default constraint namespace, or a fully
-     *                       qualified class name
-     * @param mixed $options The constraint options
+     * @param string $name    The constraint name. Either a constraint relative
+     *                        to the default constraint namespace, or a fully
+     *                        qualified class name
+     * @param mixed  $options The constraint options
      *
      * @return Constraint
      *

Tests/Constraints/AbstractComparisonValidatorTestCase.php

@@ -97,7 +97,8 @@ public function testInvalidComparisonToValue($dirtyValue, $dirtyValueAsString, $
     abstract public function provideInvalidComparisons();
 
     /**
-     * @param  array      $options Options for the constraint
+     * @param array $options Options for the constraint
+     *
      * @return Constraint
      */
     abstract protected function createConstraint(array $options);

Tests/Constraints/AbstractConstraintValidatorTest.php

@@ -119,7 +119,7 @@ protected function createContext()
     }
 
     /**
-     * @param        $message
+     * @param mixed  $message
      * @param array  $parameters
      * @param string $propertyPath
      * @param string $invalidValue
@@ -308,7 +308,7 @@ protected function assertNoViolation()
     }
 
     /**
-     * @param        $message
+     * @param mixed  $message
      * @param array  $parameters
      * @param string $propertyPath
      * @param string $invalidValue

Tests/Constraints/ChoiceValidatorTest.php

@@ -95,7 +95,7 @@ public function testValidChoiceCallbackClosure()
     {
         $constraint = new Choice(array('callback' => function () {
             return array('foo', 'bar');
-        },));
+        }, ));
 
         $this->validator->validate('bar', $constraint);
 

Tests/Mapping/ClassMetadataFactoryTest.php

@@ -105,7 +105,7 @@ public function testReadMetadataFromCache()
               ->method('read')
               ->will($this->returnValue($metadata));
 
-        $this->assertEquals($metadata,$factory->getMetadataFor(self::PARENTCLASS));
+        $this->assertEquals($metadata, $factory->getMetadataFor(self::PARENTCLASS));
     }
 }
 

ValidationVisitorInterface.php

@@ -56,11 +56,11 @@ interface ValidationVisitorInterface
      * does not find metadata for the given value, it will fail with an
      * exception.
      *
-     * @param mixed   $value        The value to validate.
-     * @param string  $group        The validation group to validate.
-     * @param string  $propertyPath The current property path in the validation graph.
-     * @param bool    $traverse     Whether to traverse the value if it is traversable.
-     * @param bool    $deep         Whether to traverse nested traversable values recursively.
+     * @param mixed  $value        The value to validate.
+     * @param string $group        The validation group to validate.
+     * @param string $propertyPath The current property path in the validation graph.
+     * @param bool   $traverse     Whether to traverse the value if it is traversable.
+     * @param bool   $deep         Whether to traverse nested traversable values recursively.
      *
      * @throws Exception\NoSuchMetadataException If no metadata can be found for
      *                                           the given value.