Merge branch '2.5' into 2.6

fabpot · fabpot · commit 93eb315b545b · 2014-12-02T21:19:20.000+01:00
* 2.5:
  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
  Remove dialog usage
  define constant only if it wasn't defined before
  Fix incorrect spanish translation
  Fixed typos

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
	src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Yaml/Inline.php
	src/Symfony/Component/Yaml/Parser.php
diff --git a/CssSelector.php b/CssSelector.php
@@ -40,8 +40,8 @@ class CssSelector
      * Optionally, a prefix can be added to the resulting XPath
      * expression with the $prefix parameter.
      *
-     * @param mixed   $cssExpr The CSS expression.
-     * @param string  $prefix  An optional prefix for the XPath expression.
+     * @param mixed  $cssExpr The CSS expression.
+     * @param string $prefix  An optional prefix for the XPath expression.
      *
      * @return string
      *
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
@@ -45,8 +45,8 @@ public function __construct($flags = 0)
     }
 
     /**
-     * @param int     $flag
-     * @param bool    $on
+     * @param int  $flag
+     * @param bool $on
      *
      * @return NodeExtension
      */
diff --git a/XPath/Translator.php b/XPath/Translator.php
@@ -227,7 +227,7 @@ public function addCombination($combiner, NodeInterface $xpath, NodeInterface $c
     }
 
     /**
-     * @param XPathExpr $xpath
+     * @param XPathExpr    $xpath
      * @param FunctionNode $function
      *
      * @return XPathExpr
diff --git a/XPath/XPathExpr.php b/XPath/XPathExpr.php
@@ -37,10 +37,10 @@ class XPathExpr
     private $condition;
 
     /**
-     * @param string  $path
-     * @param string  $element
-     * @param string  $condition
-     * @param bool    $starPrefix
+     * @param string $path
+     * @param string $element
+     * @param string $condition
+     * @param bool   $starPrefix
      */
     public function __construct($path = '', $element = '*', $condition = '', $starPrefix = false)
     {

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ class CssSelector`
`40`	`40`	`* Optionally, a prefix can be added to the resulting XPath`
`41`	`41`	`* expression with the $prefix parameter.`
`42`	`42`	`*`
`43`		`- * @param mixed $cssExpr The CSS expression.`
`44`		`- * @param string $prefix An optional prefix for the XPath expression.`
	`43`	`+ * @param mixed $cssExpr The CSS expression.`
	`44`	`+ * @param string $prefix An optional prefix for the XPath expression.`
`45`	`45`	`*`
`46`	`46`	`* @return string`
`47`	`47`	`*`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ public function __construct($flags = 0)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
`48`		`- * @param int $flag`
`49`		`- * @param bool $on`
	`48`	`+ * @param int $flag`
	`49`	`+ * @param bool $on`
`50`	`50`	`*`
`51`	`51`	`* @return NodeExtension`
`52`	`52`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public function addCombination($combiner, NodeInterface $xpath, NodeInterface $c`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/**`
`230`		`- * @param XPathExpr $xpath`
	`230`	`+ * @param XPathExpr $xpath`
`231`	`231`	`* @param FunctionNode $function`
`232`	`232`	`*`
`233`	`233`	`* @return XPathExpr`