Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged branch lanthaler/master (PR #6030)

This PR was squashed before being merged into the master branch (closes #6030).

Commits
-------

749dac1 Improve docBlock

Discussion
----------

Improve docBlock

This is just a minor change documenting the return type of `SerializerInterface::deserialize()`.
  • Loading branch information...
commit 00d132a6d31ce03666a9b1c9d4598485cd51b2c0 2 parents 9c6497f + 749dac1
@fabpot fabpot authored
View
1  src/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -32,6 +32,7 @@ public function decode($data, $format);
* Checks whether the serializer can decode from given format
*
* @param string $format format name
+ *
* @return Boolean
*/
public function supportsDecoding($format);
View
1  src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -32,6 +32,7 @@ public function encode($data, $format);
* Checks whether the serializer can encode to given format
*
* @param string $format format name
+ *
* @return Boolean
*/
public function supportsEncoding($format);
View
3  src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -96,6 +96,7 @@ public function decode($data, $format)
* Checks whether the serializer can encode to given format
*
* @param string $format format name
+ *
* @return Boolean
*/
public function supportsEncoding($format)
@@ -107,6 +108,7 @@ public function supportsEncoding($format)
* Checks whether the serializer can decode from given format
*
* @param string $format format name
+ *
* @return Boolean
*/
public function supportsDecoding($format)
@@ -116,6 +118,7 @@ public function supportsDecoding($format)
/**
* Sets the root node name
+ *
* @param string $name root node name
*/
public function setRootNodeName($name)
View
2  src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -40,6 +40,7 @@ public function denormalize($data, $class, $format = null)
*
* @param mixed $data Data to normalize.
* @param string $format The format being (de-)serialized from or into.
+ *
* @return Boolean
*/
public function supportsNormalization($data, $format = null)
@@ -53,6 +54,7 @@ public function supportsNormalization($data, $format = null)
* @param mixed $data Data to denormalize from.
* @param string $type The class to which the data should be denormalized.
* @param string $format The format being deserialized from.
+ *
* @return Boolean
*/
public function supportsDenormalization($data, $type, $format = null)
View
2  src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -24,6 +24,7 @@
* @param mixed $data data to restore
* @param string $class the expected class to instantiate
* @param string $format format the given data was extracted from
+ *
* @return object
*/
public function denormalize($data, $class, $format = null);
@@ -34,6 +35,7 @@ public function denormalize($data, $class, $format = null);
* @param mixed $data Data to denormalize from.
* @param string $type The class to which the data should be denormalized.
* @param string $format The format being deserialized from.
+ *
* @return Boolean
*/
public function supportsDenormalization($data, $type, $format = null);
View
1  src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -161,6 +161,7 @@ public function supportsDenormalization($data, $type, $format = null)
* Checks if the given class has any get{Property} method.
*
* @param string $class
+ *
* @return Boolean
*/
private function supports($class)
View
1  src/Symfony/Component/Serializer/Normalizer/NormalizableInterface.php
@@ -31,6 +31,7 @@
* can use it to normalize objects contained within this object.
* @param string|null $format The format is optionally given to be able to normalize differently
* based on different output formats.
+ *
* @return array|scalar
*/
public function normalize(NormalizerInterface $normalizer, $format = null);
View
2  src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -23,6 +23,7 @@
*
* @param object $object object to normalize
* @param string $format format the normalization result will be encoded as
+ *
* @return array|scalar
*/
public function normalize($object, $format = null);
@@ -32,6 +33,7 @@ public function normalize($object, $format = null);
*
* @param mixed $data Data to normalize.
* @param string $format The format being (de-)serialized from or into.
+ *
* @return Boolean
*/
public function supportsNormalization($data, $format = null);
View
2  src/Symfony/Component/Serializer/Serializer.php
@@ -220,6 +220,7 @@ private function getDenormalizer($data, $type, $format = null)
*
* @param object $object object to normalize
* @param string $format format name, present to give the option to normalizers to act differently based on formats
+ *
* @return array|scalar
*/
private function normalizeObject($object, $format = null)
@@ -250,6 +251,7 @@ private function normalizeObject($object, $format = null)
* @param mixed $data data to restore
* @param string $class the expected class to instantiate
* @param string $format format name, present to give the option to normalizers to act differently based on formats
+ *
* @return object
*/
private function denormalizeObject($data, $class, $format = null)
View
3  src/Symfony/Component/Serializer/SerializerInterface.php
@@ -23,6 +23,7 @@
*
* @param mixed $data any data
* @param string $format format name
+ *
* @return string
*/
public function serialize($data, $format);
@@ -33,6 +34,8 @@ public function serialize($data, $format);
* @param mixed $data
* @param string $type
* @param string $format
+ *
+ * @return object
*/
public function deserialize($data, $type, $format);
}
Please sign in to comment.
Something went wrong with that request. Please try again.