Merge branch '2.3' into 2.5

fabpot · fabpot · commit ff7533afc52b · 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/Command/InitAclCommand.php b/Command/InitAclCommand.php
@@ -17,7 +17,7 @@
 use Doctrine\DBAL\Schema\SchemaException;
 
 /**
- * Installs the tables required by the ACL system
+ * Installs the tables required by the ACL system.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
diff --git a/DependencyInjection/Compiler/AddSecurityVotersPass.php b/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Adds all configured security voters to the access decision manager
+ * Adds all configured security voters to the access decision manager.
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
diff --git a/DependencyInjection/MainConfiguration.php b/DependencyInjection/MainConfiguration.php
@@ -18,7 +18,9 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This class contains the configuration information for the following tags:
+ * This class contains the configuration information.
+ *
+ * This information is for the following tags:
  *
  *   * security.config
  *   * security.acl
diff --git a/DependencyInjection/Security/Factory/AbstractFactory.php b/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -18,7 +18,7 @@
 
 /**
  * AbstractFactory is the base class for all classes inheriting from
- * AbstractAuthenticationListener
+ * AbstractAuthenticationListener.
  *
  * @author Lukas Kahwe Smith <smith@pooteeweet.org>
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
diff --git a/Security/FirewallMap.php b/Security/FirewallMap.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * This is a lazy-loading firewall map implementation
+ * This is a lazy-loading firewall map implementation.
  *
  * Listeners will only be initialized if we really need them.
  *
diff --git a/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php b/Tests/DependencyInjection/Fixtures/UserProvider/DummyProvider.php
@@ -10,7 +10,6 @@ class DummyProvider implements UserProviderFactoryInterface
 {
     public function create(ContainerBuilder $container, $id, $config)
     {
-        
     }
 
     public function getKey()
@@ -20,6 +19,5 @@ public function getKey()
 
     public function addConfiguration(NodeDefinition $node)
     {
-        
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use Doctrine\DBAL\Schema\SchemaException;`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * Installs the tables required by the ACL system`
	`20`	`+ * Installs the tables required by the ACL system.`
`21`	`21`	`*`
`22`	`22`	`* @author Johannes M. Schmitt <[email protected]>`
`23`	`23`	`*/`
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 all configured security voters to the access decision manager`
	`19`	`+ * Adds all configured security voters to the access decision manager.`
`20`	`20`	`*`
`21`	`21`	`* @author Johannes M. Schmitt <[email protected]>`
`22`	`22`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* AbstractFactory is the base class for all classes inheriting from`
`21`		`- * AbstractAuthenticationListener`
	`21`	`+ * AbstractAuthenticationListener.`
`22`	`22`	`*`
`23`	`23`	`* @author Lukas Kahwe Smith <[email protected]>`
`24`	`24`	`* @author Johannes M. Schmitt <[email protected]>`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ class DummyProvider implements UserProviderFactoryInterface`
`10`	`10`	`{`
`11`	`11`	`public function create(ContainerBuilder $container, $id, $config)`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`public function getKey()`
`@@ -20,6 +19,5 @@ public function getKey()`
`20`	`19`
`21`	`20`	`public function addConfiguration(NodeDefinition $node)`
`22`	`21`	`{`
`23`		`-`
`24`	`22`	`}`
`25`	`23`	`}`