Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 3c370a310b55 · 2016-06-06T13:11:27.000+02:00
* 2.7: `@throws` annotations should go after `@return` Fix merge updated VERSION for 2.3.42 update CONTRIBUTORS for 2.3.42 updated CHANGELOG for 2.3.42 Revert "bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)" Partial revert of previous PR [DependencyInjection] Skip deep reference check for 'service_container' Catch \Throwable [Serializer] Add missing @throws annotations Fix for #18843 force enabling the external XML entity loaders Removed UTC specification with timestamp Conflicts: src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php src/Symfony/Component/Finder/Finder.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php src/Symfony/Component/Security/Acl/Model/AclInterface.php src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php src/Symfony/Component/Translation/Loader/XliffFileLoader.php src/Symfony/Component/Yaml/Tests/InlineTest.php
diff --git a/Encoder/ChainDecoder.php b/Encoder/ChainDecoder.php
@@ -59,7 +59,7 @@ public function supportsDecoding($format)
      *
      * @return DecoderInterface
      *
-     * @throws RuntimeException if no decoder is found
+     * @throws RuntimeException If no decoder is found.
      */
     private function getDecoder($format)
     {
diff --git a/Encoder/XmlEncoder.php b/Encoder/XmlEncoder.php
@@ -461,6 +461,8 @@ private function needsCdataWrapping($val)
      * @param mixed    $val
      *
      * @return bool
+     *
+     * @throws UnexpectedValueException
      */
     private function selectNodeType(\DOMNode $node, $val)
     {
diff --git a/Normalizer/DenormalizableInterface.php b/Normalizer/DenormalizableInterface.php
@@ -33,6 +33,8 @@ interface DenormalizableInterface
      * @param string|null           $format       The format is optionally given to be able to denormalize differently
      *                                            based on different input formats
      * @param array                 $context      options for denormalizing
+     *
+     * @return object
      */
     public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());
 }
diff --git a/Normalizer/NormalizableInterface.php b/Normalizer/NormalizableInterface.php
@@ -33,7 +33,7 @@ interface NormalizableInterface
      *                                        based on different output formats.
      * @param array               $context    Options for normalizing this object
      *
-     * @return array|string|bool|int|float|null
+     * @return array|scalar
      */
     public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());
 }
diff --git a/Normalizer/NormalizerInterface.php b/Normalizer/NormalizerInterface.php
@@ -25,7 +25,7 @@ interface NormalizerInterface
      * @param string $format  format the normalization result will be encoded as
      * @param array  $context Context options for the normalizer
      *
-     * @return array|string|bool|int|float|null
+     * @return array|scalar
      */
     public function normalize($object, $format = null, array $context = array());
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function supportsDecoding($format)`
`59`	`59`	`*`
`60`	`60`	`* @return DecoderInterface`
`61`	`61`	`*`
`62`		`- * @throws RuntimeException if no decoder is found`
	`62`	`+ * @throws RuntimeException If no decoder is found.`
`63`	`63`	`*/`
`64`	`64`	`private function getDecoder($format)`
`65`	`65`	`{`
Original file line number	Diff line number	Diff line change
`@@ -461,6 +461,8 @@ private function needsCdataWrapping($val)`
`461`	`461`	`* @param mixed $val`
`462`	`462`	`*`
`463`	`463`	`* @return bool`
	`464`	`+ *`
	`465`	`+ * @throws UnexpectedValueException`
`464`	`466`	`*/`
`465`	`467`	`private function selectNodeType(\DOMNode $node, $val)`
`466`	`468`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ interface DenormalizableInterface`
`33`	`33`	`* @param string\|null $format The format is optionally given to be able to denormalize differently`
`34`	`34`	`* based on different input formats`
`35`	`35`	`* @param array $context options for denormalizing`
	`36`	`+ *`
	`37`	`+ * @return object`
`36`	`38`	`*/`
`37`	`39`	`public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array());`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ interface NormalizableInterface`
`33`	`33`	`* based on different output formats.`
`34`	`34`	`* @param array $context Options for normalizing this object`
`35`	`35`	`*`
`36`		`- * @return array\|string\|bool\|int\|float\|null`
	`36`	`+ * @return array\|scalar`
`37`	`37`	`*/`
`38`	`38`	`public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array());`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ interface NormalizerInterface`
`25`	`25`	`* @param string $format format the normalization result will be encoded as`
`26`	`26`	`* @param array $context Context options for the normalizer`
`27`	`27`	`*`
`28`		`- * @return array\|string\|bool\|int\|float\|null`
	`28`	`+ * @return array\|scalar`
`29`	`29`	`*/`
`30`	`30`	`public function normalize($object, $format = null, array $context = array());`
`31`	`31`