Merge branch '2.3' into 2.4

fabpot · fabpot · commit 4476c94132eb · 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/Encoder/JsonDecode.php b/Encoder/JsonDecode.php
@@ -38,8 +38,8 @@ class JsonDecode implements DecoderInterface
     /**
      * Constructs a new JsonDecode instance.
      *
-     * @param Boolean  $associative True to return the result associative array, false for a nested stdClass hierarchy
-     * @param integer  $depth       Specifies the recursion depth
+     * @param bool     $associative True to return the result associative array, false for a nested stdClass hierarchy
+     * @param int      $depth       Specifies the recursion depth
      */
     public function __construct($associative = false, $depth = 512)
     {
diff --git a/Normalizer/GetSetMethodNormalizer.php b/Normalizer/GetSetMethodNormalizer.php
@@ -178,15 +178,15 @@ protected function formatAttribute($attributeName)
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function supportsNormalization($data, $format = null)
     {
         return is_object($data) && $this->supports(get_class($data));
     }
 
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function supportsDenormalization($data, $type, $format = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ class JsonDecode implements DecoderInterface`
`38`	`38`	`/**`
`39`	`39`	`* Constructs a new JsonDecode instance.`
`40`	`40`	`*`
`41`		`- * @param Boolean $associative True to return the result associative array, false for a nested stdClass hierarchy`
`42`		`- * @param integer $depth Specifies the recursion depth`
	`41`	`+ * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy`
	`42`	`+ * @param int $depth Specifies the recursion depth`
`43`	`43`	`*/`
`44`	`44`	`public function __construct($associative = false, $depth = 512)`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -178,15 +178,15 @@ protected function formatAttribute($attributeName)`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/**`
`181`		`- * {@inheritDoc}`
	`181`	`+ * {@inheritdoc}`
`182`	`182`	`*/`
`183`	`183`	`public function supportsNormalization($data, $format = null)`
`184`	`184`	`{`
`185`	`185`	`return is_object($data) && $this->supports(get_class($data));`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`/**`
`189`		`- * {@inheritDoc}`
	`189`	`+ * {@inheritdoc}`
`190`	`190`	`*/`
`191`	`191`	`public function supportsDenormalization($data, $type, $format = null)`
`192`	`192`	`{`