Merge branch '2.3' into 2.5

fabpot · fabpot · commit 1f6a93e46e85 · 2014-12-22T17:29:52.000+01:00
* 2.3:
  [2.3] CS And DocBlock Fixes
  [2.3] CS Fixes

Conflicts:
	src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
	src/Symfony/Component/Form/FormError.php
	src/Symfony/Component/HttpFoundation/Request.php
	src/Symfony/Component/HttpFoundation/Response.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Process/ProcessUtils.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
	src/Symfony/Component/Validator/Constraints/GroupSequence.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
diff --git a/DependencyInjection/Compiler/TwigEnvironmentPass.php b/DependencyInjection/Compiler/TwigEnvironmentPass.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Adds tagged twig.extension services to twig service
+ * Adds tagged twig.extension services to twig service.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
diff --git a/DependencyInjection/Compiler/TwigLoaderPass.php b/DependencyInjection/Compiler/TwigLoaderPass.php
@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 
 /**
- * Adds services tagged twig.loader as Twig loaders
+ * Adds services tagged twig.loader as Twig loaders.
  *
  * @author Daniel Leech <daniel@dantleech.com>
  */
diff --git a/Extension/ActionsExtension.php b/Extension/ActionsExtension.php
@@ -15,7 +15,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Twig extension for Symfony actions helper
+ * Twig extension for Symfony actions helper.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  *
diff --git a/Extension/AssetsExtension.php b/Extension/AssetsExtension.php
@@ -15,7 +15,7 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * Twig extension for Symfony assets helper
+ * Twig extension for Symfony assets helper.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Adds tagged twig.extension services to twig service`
	`19`	`+ * Adds tagged twig.extension services to twig service.`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <[email protected]>`
`22`	`22`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use Symfony\Component\DependencyInjection\Exception\LogicException;`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * Adds services tagged twig.loader as Twig loaders`
	`20`	`+ * Adds services tagged twig.loader as Twig loaders.`
`21`	`21`	`*`
`22`	`22`	`* @author Daniel Leech <[email protected]>`
`23`	`23`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * Twig extension for Symfony actions helper`
	`18`	`+ * Twig extension for Symfony actions helper.`
`19`	`19`	`*`
`20`	`20`	`* @author Fabien Potencier <[email protected]>`
`21`	`21`	`*`