Merge branch '2.4'

fabpot · fabpot · commit 364191773a42 · 2014-04-16T10:08:40.000+02:00
* 2.4: made types consistent with those defined in Hack made {@inheritdoc} annotations consistent across the board made {@inheritdoc} annotations consistent across the board fixed types in phpdocs [Debug] Fixed ClassNotFoundFatalErrorHandler on windows. made phpdoc types consistent with those defined in Hack Add support Thai translations [Validator] Add missing czech translations made types consistent with those defined in Hack removed extra/unsupported arguments [HttpKernel] fixed an error message [TwigBundle] removed undefined argument [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM. Conflicts: src/Symfony/Component/Console/Helper/TableHelper.php src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php src/Symfony/Component/Translation/Dumper/FileDumper.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Validator/Constraints/EmailValidator.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
diff --git a/DependencyInjection/Compiler/AddSecurityVotersPass.php b/DependencyInjection/Compiler/AddSecurityVotersPass.php
@@ -23,7 +23,7 @@
 class AddSecurityVotersPass implements CompilerPassInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function process(ContainerBuilder $container)
     {
diff --git a/Templating/Helper/LogoutUrlHelper.php b/Templating/Helper/LogoutUrlHelper.php
@@ -89,7 +89,7 @@ public function getLogoutUrl($key)
      * Generates the logout URL for the firewall.
      *
      * @param string         $key           The firewall key
-     * @param Boolean|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
+     * @param bool|string    $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
      *
      * @return string The logout URL
      *

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`class AddSecurityVotersPass implements CompilerPassInterface`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`		`- * {@inheritDoc}`
	`26`	`+ * {@inheritdoc}`
`27`	`27`	`*/`
`28`	`28`	`public function process(ContainerBuilder $container)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function getLogoutUrl($key)`
`89`	`89`	`* Generates the logout URL for the firewall.`
`90`	`90`	`*`
`91`	`91`	`* @param string $key The firewall key`
`92`		`- * @param Boolean\|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)`
	`92`	`+ * @param bool\|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)`
`93`	`93`	`*`
`94`	`94`	`* @return string The logout URL`
`95`	`95`	`*`