Merge branch '2.4'

fabpot · fabpot · commit d0094ab8c995 · 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/Encoder/JsonDecode.php b/Encoder/JsonDecode.php
@@ -41,8 +41,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
@@ -190,15 +190,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
`@@ -41,8 +41,8 @@ class JsonDecode implements DecoderInterface`
`41`	`41`	`/**`
`42`	`42`	`* Constructs a new JsonDecode instance.`
`43`	`43`	`*`
`44`		`- * @param Boolean $associative True to return the result associative array, false for a nested stdClass hierarchy`
`45`		`- * @param integer $depth Specifies the recursion depth`
	`44`	`+ * @param bool $associative True to return the result associative array, false for a nested stdClass hierarchy`
	`45`	`+ * @param int $depth Specifies the recursion depth`
`46`	`46`	`*/`
`47`	`47`	`public function __construct($associative = false, $depth = 512)`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -190,15 +190,15 @@ protected function formatAttribute($attributeName)`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`/**`
`193`		`- * {@inheritDoc}`
	`193`	`+ * {@inheritdoc}`
`194`	`194`	`*/`
`195`	`195`	`public function supportsNormalization($data, $format = null)`
`196`	`196`	`{`
`197`	`197`	`return is_object($data) && $this->supports(get_class($data));`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/**`
`201`		`- * {@inheritDoc}`
	`201`	`+ * {@inheritdoc}`
`202`	`202`	`*/`
`203`	`203`	`public function supportsDenormalization($data, $type, $format = null)`
`204`	`204`	`{`