Merge branch '2.3' into 2.4

fabpot · fabpot · commit b81e72b669e9 · 2014-04-16T10:02:57.000+02:00
* 2.3: made {@inheritdoc} annotations consistent across the board fixed types in phpdocs made phpdoc types consistent with those defined in Hack Add support Thai 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/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Helper/DescriptorHelper.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php src/Symfony/Component/Stopwatch/StopwatchPeriod.php src/Symfony/Component/Translation/TranslatorInterface.php src/Symfony/Component/Validator/ConstraintValidatorFactory.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`	`*`