Merge branch '2.5' into 2.6

fabpot · fabpot · commit 103d5436d89a · 2014-12-22T17:44:09.000+01:00
* 2.5:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes
  [FrameworkBundle] Fixed Translation loader and update translation command.
  [Console] remove « use » statement for PHP built-in exception classes.
  [SecurityBundle] adds unit tests suite for SecurityDataCollector class.

Conflicts:
	src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php
	src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
	src/Symfony/Component/Form/Form.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/Stopwatch/Stopwatch.php
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
	src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
diff --git a/XPath/TranslatorInterface.php b/XPath/TranslatorInterface.php
@@ -34,7 +34,7 @@ interface TranslatorInterface
     public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');
 
     /**
-     * Translates a parsed selector node to an XPath expression
+     * Translates a parsed selector node to an XPath expression.
      *
      * @param SelectorNode $selector
      * @param string       $prefix

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ interface TranslatorInterface`
`34`	`34`	`public function cssToXPath($cssExpr, $prefix = 'descendant-or-self::');`
`35`	`35`
`36`	`36`	`/**`
`37`		`- * Translates a parsed selector node to an XPath expression`
	`37`	`+ * Translates a parsed selector node to an XPath expression.`
`38`	`38`	`*`
`39`	`39`	`* @param SelectorNode $selector`
`40`	`40`	`* @param string $prefix`