diff --git a/core/vendor/composer/ClassLoader.php b/core/vendor/composer/ClassLoader.php
index 88684c52657173a7b2f321351c169ca0e08972a4..443364959a541bf85ac0e77476f1ded4feb93747 100644
--- a/core/vendor/composer/ClassLoader.php
+++ b/core/vendor/composer/ClassLoader.php
@@ -143,6 +143,8 @@ public function add($prefix, $paths, $prepend = false)
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-0 base directories
* @param bool $prepend Whether to prepend the directories
+ *
+ * @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
@@ -204,6 +206,8 @@ public function set($prefix, $paths)
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
+ *
+ * @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index c701f6102916211449b4b2a60b04d90b9b81ddf6..fbc00eb8cd63322cafdf643d533fb44270a86661 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -1336,55 +1336,6 @@
"url"
]
},
- {
- "name": "symfony/serializer",
- "version": "v2.4.1",
- "version_normalized": "2.4.1.0",
- "target-dir": "Symfony/Component/Serializer",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Serializer.git",
- "reference": "60c54346958604379392672a3a998650a169a7f4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/60c54346958604379392672a3a998650a169a7f4",
- "reference": "60c54346958604379392672a3a998650a169a7f4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "time": "2014-01-01 08:14:50",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.4-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Serializer\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- }
- ],
- "description": "Symfony Serializer Component",
- "homepage": "http://symfony.com"
- },
{
"name": "symfony/property-access",
"version": "v2.4.1",
@@ -2502,5 +2453,56 @@
"BSD"
],
"homepage": "http://vfs.bovigo.org/"
+ },
+ {
+ "name": "symfony/serializer",
+ "version": "v2.5.2",
+ "version_normalized": "2.5.2.0",
+ "target-dir": "Symfony/Component/Serializer",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Serializer.git",
+ "reference": "33185b290310ab1fd8283fb8ed2a434cdb88b9b9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Serializer/zipball/33185b290310ab1fd8283fb8ed2a434cdb88b9b9",
+ "reference": "33185b290310ab1fd8283fb8ed2a434cdb88b9b9",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "time": "2014-07-09 09:05:48",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.5-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Serializer\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com",
+ "homepage": "http://fabien.potencier.org",
+ "role": "Lead Developer"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "http://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Serializer Component",
+ "homepage": "http://symfony.com"
}
]
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md b/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
index 5b859623fef09e891f4dd2bd8ca84e363f89f2ef..d5502b062f470c9941186af0fae576885eaea3b5 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/CHANGELOG.md
@@ -1,10 +1,17 @@
CHANGELOG
=========
+2.5.0
+-----
+
+ * added support for `is.*` getters in `GetSetMethodNormalizer`
+
2.4.0
-----
* added `$context` support for XMLEncoder.
+ * [DEPRECATION] JsonEncode and JsonDecode where modified to throw
+ an exception if error found. No need for get*Error() functions
2.3.0
-----
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index 088420b11820c5ab0d998f548a2667eed794503d..43dfa001189144881905a52b5d90b3ec3a07f934 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -57,7 +57,7 @@ public function supportsEncoding($format)
*
* @param string $format
*
- * @return Boolean
+ * @return bool
*/
public function needsNormalization($format)
{
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
index 9dd336d5f78571b7ebe20dbf8649588170738be3..34e21bc0e3beebbea2b9c2fc6cd42aa5b85ce236 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/DecoderInterface.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Serializer\Encoder;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
/**
* Defines the interface of decoders
*
@@ -31,6 +33,8 @@ interface DecoderInterface
* phpdoc comment.
*
* @return mixed
+ *
+ * @throws UnexpectedValueException
*/
public function decode($data, $format, array $context = array());
@@ -39,7 +43,7 @@ public function decode($data, $format, array $context = array());
*
* @param string $format format name
*
- * @return Boolean
+ * @return bool
*/
public function supportsDecoding($format);
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
index 2290db7f50d853610da5e908b5c446ebffe6dca9..394df9999fb2d7297799eb19f8fd6eaa2924f966 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/EncoderInterface.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Serializer\Encoder;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
/**
* Defines the interface of encoders
*
@@ -26,6 +28,8 @@ interface EncoderInterface
* @param array $context options that normalizers/encoders have access to.
*
* @return scalar
+ *
+ * @throws UnexpectedValueException
*/
public function encode($data, $format, array $context = array());
@@ -34,7 +38,7 @@ public function encode($data, $format, array $context = array());
*
* @param string $format format name
*
- * @return Boolean
+ * @return bool
*/
public function supportsEncoding($format);
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
index f8dfab35a889422dac0c8bffab457ba25879bb2b..8fb321fc69112439dbb524199ff3e1caa1752943 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonDecode.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Serializer\Encoder;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
/**
* Decodes JSON data
*
@@ -21,25 +23,26 @@ class JsonDecode implements DecoderInterface
/**
* Specifies if the returned result should be an associative array or a nested stdClass object hierarchy.
*
- * @var Boolean
+ * @var bool
*/
private $associative;
/**
* Specifies the recursion depth.
*
- * @var integer
+ * @var int
*/
private $recursionDepth;
private $lastError = JSON_ERROR_NONE;
+
protected $serializer;
/**
* 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)
{
@@ -50,7 +53,9 @@ public function __construct($associative = false, $depth = 512)
/**
* Returns the last decoding error (if any).
*
- * @return integer
+ * @return int
+ *
+ * @deprecated since 2.5, decode() throws an exception if error found, will be removed in 3.0
*
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
*/
@@ -82,6 +87,8 @@ public function getLastError()
*
* @return mixed
*
+ * @throws UnexpectedValueException
+ *
* @see http://php.net/json_decode json_decode
*/
public function decode($data, $format, array $context = array())
@@ -98,7 +105,9 @@ public function decode($data, $format, array $context = array())
$decodedData = json_decode($data, $associative, $recursionDepth);
}
- $this->lastError = json_last_error();
+ if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
+ throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+ }
return $decodedData;
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
index 4e0de3ed75890ce4e89b178f46321a79c3ef35fb..06edff5a455952462118b9ec868829f5ddec7c44 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\Serializer\Encoder;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
/**
* Encodes JSON data
*
@@ -27,9 +29,11 @@ public function __construct($bitmask = 0)
}
/**
- * Returns the last encoding error (if any)
+ * Returns the last encoding error (if any).
+ *
+ * @return int
*
- * @return integer
+ * @deprecated since 2.5, encode() throws an exception if error found, will be removed in 3.0
*
* @see http://php.net/manual/en/function.json-last-error.php json_last_error
*/
@@ -48,7 +52,10 @@ public function encode($data, $format, array $context = array())
$context = $this->resolveContext($context);
$encodedJson = json_encode($data, $context['json_encode_options']);
- $this->lastError = json_last_error();
+
+ if (JSON_ERROR_NONE !== $this->lastError = json_last_error()) {
+ throw new UnexpectedValueException(JsonEncoder::getLastErrorMessage());
+ }
return $encodedJson;
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
index 95dae7c8c6674efdc1aeffcfd0d28302ded10888..9137c926b30d95064bf1472bf98d5ad622010269 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/JsonEncoder.php
@@ -39,7 +39,9 @@ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodin
/**
* Returns the last encoding error (if any)
*
- * @return integer
+ * @return int
+ *
+ * @deprecated since 2.5, JsonEncode throws exception if an error is found, will be removed in 3.0
*/
public function getLastEncodingError()
{
@@ -49,7 +51,9 @@ public function getLastEncodingError()
/**
* Returns the last decoding error (if any)
*
- * @return integer
+ * @return int
+ *
+ * @deprecated since 2.5, JsonDecode throws exception if an error is found, will be removed in 3.0
*/
public function getLastDecodingError()
{
@@ -87,4 +91,31 @@ public function supportsDecoding($format)
{
return self::FORMAT === $format;
}
+
+ /**
+ * Resolves json_last_error message.
+ *
+ * @return string
+ */
+ public static function getLastErrorMessage()
+ {
+ if (function_exists('json_last_error_msg')) {
+ return json_last_error_msg();
+ }
+
+ switch (json_last_error()) {
+ case JSON_ERROR_DEPTH:
+ return 'Maximum stack depth exceeded';
+ case JSON_ERROR_STATE_MISMATCH:
+ return 'Underflow or the modes mismatch';
+ case JSON_ERROR_CTRL_CHAR:
+ return 'Unexpected control character found';
+ case JSON_ERROR_SYNTAX:
+ return 'Syntax error, malformed JSON';
+ case JSON_ERROR_UTF8:
+ return 'Malformed UTF-8 characters, possibly incorrectly encoded';
+ default:
+ return 'Unknown error';
+ }
+ }
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
index 9cd2417b468b231a8ebff70f98d0d63f653a0eb4..8c47e418a58d1b9dfc195e75c2a1349c836007fb 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -68,17 +68,23 @@ public function encode($data, $format, array $context = array())
*/
public function decode($data, $format, array $context = array())
{
+ if ('' === trim($data)) {
+ throw new UnexpectedValueException('Invalid XML data, it can not be empty.');
+ }
+
$internalErrors = libxml_use_internal_errors(true);
$disableEntities = libxml_disable_entity_loader(true);
libxml_clear_errors();
$dom = new \DOMDocument();
- $dom->loadXML($data, LIBXML_NONET);
+ $dom->loadXML($data, LIBXML_NONET | LIBXML_NOBLANKS);
libxml_use_internal_errors($internalErrors);
libxml_disable_entity_loader($disableEntities);
if ($error = libxml_get_last_error()) {
+ libxml_clear_errors();
+
throw new UnexpectedValueException($error->message);
}
@@ -88,26 +94,27 @@ public function decode($data, $format, array $context = array())
}
}
- $xml = simplexml_import_dom($dom);
+ $rootNode = $dom->firstChild;
- if ($error = libxml_get_last_error()) {
- throw new UnexpectedValueException($error->message);
+ // todo: throw an exception if the root node name is not correctly configured (bc)
+
+ if ($rootNode->hasChildNodes()) {
+ return $this->parseXml($rootNode);
}
- if (!$xml->count()) {
- if (!$xml->attributes()) {
- return (string) $xml;
- }
- $data = array();
- foreach ($xml->attributes() as $attrkey => $attr) {
- $data['@'.$attrkey] = (string) $attr;
- }
- $data['#'] = (string) $xml;
+ if (!$rootNode->hasAttributes()) {
+ return $rootNode->nodeValue;
+ }
- return $data;
+ $data = array();
+
+ foreach ($rootNode->attributes as $attrKey => $attr) {
+ $data['@'.$attrKey] = $attr->nodeValue;
}
- return $this->parseXml($xml);
+ $data['#'] = $rootNode->nodeValue;
+
+ return $data;
}
/**
@@ -149,7 +156,7 @@ public function getRootNodeName()
* @param \DOMNode $node
* @param string $val
*
- * @return Boolean
+ * @return bool
*/
final protected function appendXMLString(\DOMNode $node, $val)
{
@@ -168,7 +175,7 @@ final protected function appendXMLString(\DOMNode $node, $val)
* @param \DOMNode $node
* @param string $val
*
- * @return Boolean
+ * @return bool
*/
final protected function appendText(\DOMNode $node, $val)
{
@@ -182,7 +189,7 @@ final protected function appendText(\DOMNode $node, $val)
* @param \DOMNode $node
* @param string $val
*
- * @return Boolean
+ * @return bool
*/
final protected function appendCData(\DOMNode $node, $val)
{
@@ -196,7 +203,7 @@ final protected function appendCData(\DOMNode $node, $val)
* @param \DOMNode $node
* @param \DOMDocumentFragment $fragment
*
- * @return Boolean
+ * @return bool
*/
final protected function appendDocumentFragment(\DOMNode $node, $fragment)
{
@@ -214,7 +221,7 @@ final protected function appendDocumentFragment(\DOMNode $node, $fragment)
*
* @param string $name
*
- * @return Boolean
+ * @return bool
*/
final protected function isElementNameValid($name)
{
@@ -224,54 +231,107 @@ final protected function isElementNameValid($name)
}
/**
- * Parse the input SimpleXmlElement into an array.
+ * Parse the input DOMNode into an array or a string.
+ *
+ * @param \DOMNode $node xml to parse
+ *
+ * @return array|string
+ */
+ private function parseXml(\DOMNode $node)
+ {
+ $data = $this->parseXmlAttributes($node);
+
+ $value = $this->parseXmlValue($node);
+
+ if (!count($data)) {
+ return $value;
+ }
+
+ if (!is_array($value)) {
+ $data['#'] = $value;
+
+ return $data;
+ }
+
+ if (1 === count($value) && key($value)) {
+ $data[key($value)] = current($value);
+
+ return $data;
+ }
+
+ foreach ($value as $key => $val) {
+ $data[$key] = $val;
+ }
+
+ return $data;
+ }
+
+ /**
+ * Parse the input DOMNode attributes into an array
*
- * @param \SimpleXmlElement $node xml to parse
+ * @param \DOMNode $node xml to parse
*
* @return array
*/
- private function parseXml(\SimpleXmlElement $node)
+ private function parseXmlAttributes(\DOMNode $node)
{
- $data = array();
- if ($node->attributes()) {
- foreach ($node->attributes() as $attrkey => $attr) {
- $data['@'.$attrkey] = (string) $attr;
- }
+ if (!$node->hasAttributes()) {
+ return array();
}
- foreach ($node->children() as $key => $subnode) {
- if ($subnode->count()) {
- $value = $this->parseXml($subnode);
- } elseif ($subnode->attributes()) {
- $value = array();
- foreach ($subnode->attributes() as $attrkey => $attr) {
- $value['@'.$attrkey] = (string) $attr;
- }
- $value['#'] = (string) $subnode;
+
+ $data = array();
+
+ foreach ($node->attributes as $attrkey => $attr) {
+ if (ctype_digit($attr->nodeValue)) {
+ $data['@'.$attrkey] = (int) $attr->nodeValue;
} else {
- $value = (string) $subnode;
+ $data['@'.$attrkey] = $attr->nodeValue;
}
+ }
- if ($key === 'item') {
- if (isset($value['@key'])) {
- if (isset($value['#'])) {
- $data[$value['@key']] = $value['#'];
- } else {
- $data[$value['@key']] = $value;
- }
+ return $data;
+ }
+
+ /**
+ * Parse the input DOMNode value (content and children) into an array or a string
+ *
+ * @param \DOMNode $node xml to parse
+ *
+ * @return array|string
+ */
+ private function parseXmlValue(\DOMNode $node)
+ {
+ if (!$node->hasChildNodes()) {
+ return $node->nodeValue;
+ }
+
+ if (1 === $node->childNodes->length && in_array($node->firstChild->nodeType, array(XML_TEXT_NODE, XML_CDATA_SECTION_NODE))) {
+ return $node->firstChild->nodeValue;
+ }
+
+ $value = array();
+
+ foreach ($node->childNodes as $subnode) {
+ $val = $this->parseXml($subnode);
+
+ if ('item' === $subnode->nodeName && isset($val['@key'])) {
+ if (isset($val['#'])) {
+ $value[$val['@key']] = $val['#'];
} else {
- $data['item'][] = $value;
- }
- } elseif (array_key_exists($key, $data) || $key == "entry") {
- if ((false === is_array($data[$key])) || (false === isset($data[$key][0]))) {
- $data[$key] = array($data[$key]);
+ $value[$val['@key']] = $val;
}
- $data[$key][] = $value;
} else {
- $data[$key] = $value;
+ $value[$subnode->nodeName][] = $val;
}
}
- return $data;
+ foreach ($value as $key => $val) {
+ if (is_array($val) && 1 === count($val)) {
+ $value[$key] = current($val);
+ }
+ }
+
+ return $value;
}
/**
@@ -281,7 +341,7 @@ private function parseXml(\SimpleXmlElement $node)
* @param array|object $data
* @param string|null $xmlRootNodeName
*
- * @return Boolean
+ * @return bool
*
* @throws UnexpectedValueException
*/
@@ -350,7 +410,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
* @param string $nodeName
* @param string $key
*
- * @return Boolean
+ * @return bool
*/
private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
{
@@ -372,7 +432,7 @@ private function appendNode(\DOMNode $parentNode, $data, $nodeName, $key = null)
*
* @param string $val
*
- * @return Boolean
+ * @return bool
*/
private function needsCdataWrapping($val)
{
@@ -385,7 +445,7 @@ private function needsCdataWrapping($val)
* @param \DOMNode $node
* @param mixed $val
*
- * @return Boolean
+ * @return bool
*/
private function selectNodeType(\DOMNode $node, $val)
{
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/LICENSE b/core/vendor/symfony/serializer/Symfony/Component/Serializer/LICENSE
index 88a57f8d8da49126c6f7d225d567ad216ace4d83..0b3292cf9023507c2f1f93ddfee7dd8e15838048 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/LICENSE
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 Fabien Potencier
+Copyright (c) 2004-2014 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
index 0ebe00fda54f54452e9c2486e24ee05c553b8386..83c3c1438462211da1bbdacc21daceccd6eb34e8 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php
@@ -29,7 +29,7 @@ public function normalize($object, $format = null, array $context = array())
*/
public function denormalize($data, $class, $format = null, array $context = array())
{
- $object = new $class;
+ $object = new $class();
$object->denormalize($this->serializer, $data, $format, $context);
return $object;
@@ -41,7 +41,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
* @param mixed $data Data to normalize.
* @param string $format The format being (de-)serialized from or into.
*
- * @return Boolean
+ * @return bool
*/
public function supportsNormalization($data, $format = null)
{
@@ -55,7 +55,7 @@ public function supportsNormalization($data, $format = null)
* @param string $type The class to which the data should be denormalized.
* @param string $format The format being deserialized from.
*
- * @return Boolean
+ * @return bool
*/
public function supportsDenormalization($data, $type, $format = null)
{
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
index 1a5ff93f751de757b1052f39728cfc47103ddb11..001dd6863dcf65787ee793ab34d793c84c518934 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php
@@ -37,7 +37,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
* @param string $type The class to which the data should be denormalized.
* @param string $format The format being deserialized from.
*
- * @return Boolean
+ * @return bool
*/
public function supportsDenormalization($data, $type, $format = null);
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
index 1b1a5f56887491e9e374604587bc4c3bb14f21f9..9f2374266c6569590012fcb362aa3e0d98b44675 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -46,6 +46,8 @@ class GetSetMethodNormalizer extends SerializerAwareNormalizer implements Normal
* @param callable[] $callbacks help normalize the result
*
* @throws InvalidArgumentException if a non-callable callback is set
+ *
+ * @return GetSetMethodNormalizer
*/
public function setCallbacks(array $callbacks)
{
@@ -55,26 +57,36 @@ public function setCallbacks(array $callbacks)
}
}
$this->callbacks = $callbacks;
+
+ return $this;
}
/**
* Set ignored attributes for normalization
*
* @param array $ignoredAttributes
+ *
+ * @return GetSetMethodNormalizer
*/
public function setIgnoredAttributes(array $ignoredAttributes)
{
$this->ignoredAttributes = $ignoredAttributes;
+
+ return $this;
}
/**
* Set attributes to be camelized on denormalize
*
* @param array $camelizedAttributes
+ *
+ * @return GetSetMethodNormalizer
*/
public function setCamelizedAttributes(array $camelizedAttributes)
{
$this->camelizedAttributes = $camelizedAttributes;
+
+ return $this;
}
/**
@@ -88,7 +100,7 @@ public function normalize($object, $format = null, array $context = array())
$attributes = array();
foreach ($reflectionMethods as $method) {
if ($this->isGetMethod($method)) {
- $attributeName = lcfirst(substr($method->name, 3));
+ $attributeName = lcfirst(substr($method->name, 0 === strpos($method->name, 'is') ? 2 : 3));
if (in_array($attributeName, $this->ignoredAttributes)) {
continue;
@@ -99,6 +111,9 @@ public function normalize($object, $format = null, array $context = array())
$attributeValue = call_user_func($this->callbacks[$attributeName], $attributeValue);
}
if (null !== $attributeValue && !is_scalar($attributeValue)) {
+ if (!$this->serializer instanceof NormalizerInterface) {
+ throw new \LogicException(sprintf('Cannot normalize attribute "%s" because injected serializer is not a normalizer', $attributeName));
+ }
$attributeValue = $this->serializer->normalize($attributeValue, $format);
}
@@ -128,7 +143,9 @@ public function denormalize($data, $class, $format = null, array $context = arra
$params[] = $data[$paramName];
// don't run set for a parameter passed to the constructor
unset($data[$paramName]);
- } elseif (!$constructorParameter->isOptional()) {
+ } elseif ($constructorParameter->isOptional()) {
+ $params[] = $constructorParameter->getDefaultValue();
+ } else {
throw new RuntimeException(
'Cannot create an instance of '.$class.
' from serialized data because its constructor requires '.
@@ -175,7 +192,7 @@ protected function formatAttribute($attributeName)
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function supportsNormalization($data, $format = null)
{
@@ -183,7 +200,7 @@ public function supportsNormalization($data, $format = null)
}
/**
- * {@inheritDoc}
+ * {@inheritdoc}
*/
public function supportsDenormalization($data, $type, $format = null)
{
@@ -195,7 +212,7 @@ public function supportsDenormalization($data, $type, $format = null)
*
* @param string $class
*
- * @return Boolean
+ * @return bool
*/
private function supports($class)
{
@@ -211,17 +228,19 @@ private function supports($class)
}
/**
- * Checks if a method's name is get.* and can be called without parameters.
+ * Checks if a method's name is get.* or is.*, and can be called without parameters.
*
* @param \ReflectionMethod $method the method to check
*
- * @return Boolean whether the method is a getter.
+ * @return bool whether the method is a getter or boolean getter.
*/
private function isGetMethod(\ReflectionMethod $method)
{
+ $methodLength = strlen($method->name);
+
return (
- 0 === strpos($method->name, 'get') &&
- 3 < strlen($method->name) &&
+ ((0 === strpos($method->name, 'get') && 3 < $methodLength) ||
+ (0 === strpos($method->name, 'is') && 2 < $methodLength)) &&
0 === $method->getNumberOfRequiredParameters()
);
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
index 744307a2ba37d4ebf11d01966031f1c56c628118..22a95438a098e84d3df6ba817ccba70086594cfd 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -35,7 +35,7 @@ public function normalize($object, $format = null, array $context = array());
* @param mixed $data Data to normalize.
* @param string $format The format being (de-)serialized from or into.
*
- * @return Boolean
+ * @return bool
*/
public function supportsNormalization($data, $format = null);
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
index 73ae9fa47411efd86477a39ba0c7024795d3e156..55fa0cd1ca68d91bf87c9b6c5ef767bb8d084426 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Serializer.php
@@ -17,7 +17,6 @@
use Symfony\Component\Serializer\Encoder\DecoderInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
-use Symfony\Component\Serializer\Exception\RuntimeException;
use Symfony\Component\Serializer\Exception\LogicException;
use Symfony\Component\Serializer\Exception\UnexpectedValueException;
@@ -144,13 +143,7 @@ public function denormalize($data, $type, $format = null, array $context = array
*/
public function supportsNormalization($data, $format = null)
{
- try {
- $this->getNormalizer($data, $format);
- } catch (RuntimeException $e) {
- return false;
- }
-
- return true;
+ return null !== $this->getNormalizer($data, $format);
}
/**
@@ -158,41 +151,56 @@ public function supportsNormalization($data, $format = null)
*/
public function supportsDenormalization($data, $type, $format = null)
{
- try {
- $this->getDenormalizer($data, $type, $format = null);
- } catch (RuntimeException $e) {
- return false;
- }
-
- return true;
+ return null !== $this->getDenormalizer($data, $type, $format);
}
/**
- * {@inheritdoc}
+ * Returns a matching normalizer.
+ *
+ * @param object $data The object to get the serializer for
+ * @param string $format format name, present to give the option to normalizers to act differently based on formats
+ *
+ * @return NormalizerInterface|null
*/
- private function getNormalizer($data, $format = null)
+ private function getNormalizer($data, $format)
{
+
+ $class = get_class($data);
+ if (isset($this->normalizerCache[$class][$format])) {
+ return $this->normalizerCache[$class][$format];
+ }
+
foreach ($this->normalizers as $normalizer) {
if ($normalizer instanceof NormalizerInterface && $normalizer->supportsNormalization($data, $format)) {
+ $this->normalizerCache[$class][$format] = $normalizer;
+
return $normalizer;
}
}
-
- throw new RuntimeException(sprintf('No normalizer found for format "%s".', $format));
}
/**
- * {@inheritdoc}
+ * Returns a matching denormalizer.
+ *
+ * @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 DenormalizerInterface|null
*/
- private function getDenormalizer($data, $type, $format = null)
+ private function getDenormalizer($data, $class, $format)
{
+ if (isset($this->denormalizerCache[$class][$format])) {
+ return $this->denormalizerCache[$class][$format];
+ }
+
foreach ($this->normalizers as $normalizer) {
- if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $type, $format)) {
+ if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $class, $format)) {
+ $this->denormalizerCache[$class][$format] = $normalizer;
+
return $normalizer;
}
}
-
- throw new RuntimeException(sprintf('No denormalizer found for format "%s".', $format));
}
/**
@@ -223,27 +231,16 @@ final public function decode($data, $format, array $context = array())
* @throws LogicException
* @throws UnexpectedValueException
*/
- private function normalizeObject($object, $format = null, array $context = array())
+ private function normalizeObject($object, $format, array $context = array())
{
if (!$this->normalizers) {
throw new LogicException('You must register at least one normalizer to be able to normalize objects.');
}
- $class = get_class($object);
- if (isset($this->normalizerCache[$class][$format])) {
- return $this->normalizerCache[$class][$format]->normalize($object, $format, $context);
+ if ($normalizer = $this->getNormalizer($object, $format)) {
+ return $normalizer->normalize($object, $format, $context);
}
-
- foreach ($this->normalizers as $normalizer) {
- if ($normalizer instanceof NormalizerInterface
- && $normalizer->supportsNormalization($object, $format)) {
- $this->normalizerCache[$class][$format] = $normalizer;
-
- return $normalizer->normalize($object, $format, $context);
- }
- }
-
- throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', $class));
+ throw new UnexpectedValueException(sprintf('Could not normalize object of type %s, no supporting normalizer found.', get_class($object)));
}
/**
@@ -259,25 +256,15 @@ private function normalizeObject($object, $format = null, array $context = array
* @throws LogicException
* @throws UnexpectedValueException
*/
- private function denormalizeObject($data, $class, $format = null, array $context = array())
+ private function denormalizeObject($data, $class, $format, array $context = array())
{
if (!$this->normalizers) {
throw new LogicException('You must register at least one normalizer to be able to denormalize objects.');
}
- if (isset($this->denormalizerCache[$class][$format])) {
- return $this->denormalizerCache[$class][$format]->denormalize($data, $class, $format, $context);
- }
-
- foreach ($this->normalizers as $normalizer) {
- if ($normalizer instanceof DenormalizerInterface
- && $normalizer->supportsDenormalization($data, $class, $format)) {
- $this->denormalizerCache[$class][$format] = $normalizer;
-
- return $normalizer->denormalize($data, $class, $format, $context);
- }
+ if ($normalizer = $this->getDenormalizer($data, $class, $format)) {
+ return $normalizer->denormalize($data, $class, $format, $context);
}
-
throw new UnexpectedValueException(sprintf('Could not denormalize object of type %s, no supporting normalizer found.', $class));
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
index 00714f23ba2a90eafcf1331ea384b9a12df3619b..87f685c667c6c7d886267bb5e87b089f511d27bb 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -25,7 +25,7 @@ protected function setUp()
public function testEncodeScalar()
{
- $obj = new \stdClass;
+ $obj = new \stdClass();
$obj->foo = "foo";
$expected = '{"foo":"foo"}';
@@ -68,7 +68,7 @@ protected function getJsonSource()
protected function getObject()
{
- $obj = new \stdClass;
+ $obj = new \stdClass();
$obj->foo = 'foo';
$obj->bar = array('a', 'b');
$obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index 6ad2a6c2e2561f0573fa75db828cb333deb3d3b8..4f83c6f948a70432dd44df154aa0256f87562d00 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -228,6 +228,31 @@ public function testDecode()
$this->assertEquals(get_object_vars($obj), $this->encoder->decode($source, 'xml'));
}
+ public function testDecodeCdataWrapping()
+ {
+ $expected = array(
+ 'firstname' => 'Paul <or Me>',
+ );
+
+ $xml = '<?xml version="1.0"?>'."\n".
+ '<response><firstname><![CDATA[Paul <or Me>]]></firstname></response>'."\n";
+
+ $this->assertEquals($expected, $this->encoder->decode($xml, 'xml'));
+ }
+
+ public function testDecodeCdataWrappingAndWhitespace()
+ {
+ $expected = array(
+ 'firstname' => 'Paul <or Me>',
+ );
+
+ $xml = '<?xml version="1.0"?>'."\n".
+ '<response><firstname>'."\n".
+ '<![CDATA[Paul <or Me>]]></firstname></response>'."\n";
+
+ $this->assertEquals($expected, $this->encoder->decode($xml, 'xml'));
+ }
+
public function testDecodeScalarWithAttribute()
{
$source = '<?xml version="1.0"?>'."\n".
@@ -347,6 +372,12 @@ public function testPreventsComplexExternalEntities()
}
}
+ public function testDecodeEmptyXml()
+ {
+ $this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');
+ $this->encoder->decode(' ', 'xml');
+ }
+
protected function getXmlSource()
{
return '<?xml version="1.0"?>'."\n".
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
index eef163442edacba9e67806674b06b49fe5437851..0aeaba472a1748fcdb7af504401ff0fa8f09616e 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
@@ -46,7 +46,7 @@ public function testDeserialize()
public function testSupportsNormalization()
{
$this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy()));
- $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass));
+ $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
}
public function testSupportsDenormalization()
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index f3bf9694d206c0e0d2a2e627d44b94f5e0d3002d..2ec68c0a0d0e6cf2c3900d27aa704aecfe68af4c 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -12,23 +12,44 @@
namespace Symfony\Component\Serializer\Tests\Normalizer;
use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
{
protected function setUp()
{
+ $this->serializer = $this->getMock(__NAMESPACE__.'\SerializerNormalizer');
$this->normalizer = new GetSetMethodNormalizer();
- $this->normalizer->setSerializer($this->getMock('Symfony\Component\Serializer\Serializer'));
+ $this->normalizer->setSerializer($this->serializer);
}
public function testNormalize()
{
$obj = new GetSetDummy();
+ $object = new \stdClass();
$obj->setFoo('foo');
$obj->setBar('bar');
+ $obj->setBaz(true);
$obj->setCamelCase('camelcase');
+ $obj->setObject($object);
+
+ $this->serializer
+ ->expects($this->once())
+ ->method('normalize')
+ ->with($object, 'any')
+ ->will($this->returnValue('string_object'))
+ ;
+
$this->assertEquals(
- array('foo' => 'foo', 'bar' => 'bar', 'fooBar' => 'foobar', 'camelCase' => 'camelcase'),
+ array(
+ 'foo' => 'foo',
+ 'bar' => 'bar',
+ 'baz' => true,
+ 'fooBar' => 'foobar',
+ 'camelCase' => 'camelcase',
+ 'object' => 'string_object',
+ ),
$this->normalizer->normalize($obj, 'any')
);
}
@@ -36,12 +57,13 @@ public function testNormalize()
public function testDenormalize()
{
$obj = $this->normalizer->denormalize(
- array('foo' => 'foo', 'bar' => 'bar', 'fooBar' => 'foobar'),
+ array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
__NAMESPACE__.'\GetSetDummy',
'any'
);
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->getBar());
+ $this->assertTrue($obj->isBaz());
}
public function testDenormalizeOnCamelCaseFormat()
@@ -80,10 +102,21 @@ public function attributeProvider()
public function testConstructorDenormalize()
{
$obj = $this->normalizer->denormalize(
- array('foo' => 'foo', 'bar' => 'bar', 'fooBar' => 'foobar'),
+ array('foo' => 'foo', 'bar' => 'bar', 'baz' => true, 'fooBar' => 'foobar'),
__NAMESPACE__.'\GetConstructorDummy', 'any');
$this->assertEquals('foo', $obj->getFoo());
$this->assertEquals('bar', $obj->getBar());
+ $this->assertTrue($obj->isBaz());
+ }
+
+ public function testConstructorDenormalizeWithMissingOptionalArgument()
+ {
+ $obj = $this->normalizer->denormalize(
+ array('foo' => 'test', 'baz' => array(1, 2, 3)),
+ __NAMESPACE__.'\GetConstructorOptionalArgsDummy', 'any');
+ $this->assertEquals('test', $obj->getFoo());
+ $this->assertEquals(array(), $obj->getBar());
+ $this->assertEquals(array(1, 2, 3), $obj->getBaz());
}
/**
@@ -93,7 +126,7 @@ public function testCallbacks($callbacks, $value, $result, $message)
{
$this->normalizer->setCallbacks($callbacks);
- $obj = new GetConstructorDummy('', $value);
+ $obj = new GetConstructorDummy('', $value, true);
$this->assertEquals(
$result,
@@ -109,18 +142,19 @@ public function testUncallableCallbacks()
{
$this->normalizer->setCallbacks(array('bar' => null));
- $obj = new GetConstructorDummy('baz', 'quux');
+ $obj = new GetConstructorDummy('baz', 'quux', true);
$this->normalizer->normalize($obj, 'any');
}
public function testIgnoredAttributes()
{
- $this->normalizer->setIgnoredAttributes(array('foo', 'bar', 'camelCase'));
+ $this->normalizer->setIgnoredAttributes(array('foo', 'bar', 'baz', 'camelCase', 'object'));
$obj = new GetSetDummy();
$obj->setFoo('foo');
$obj->setBar('bar');
+ $obj->setBaz(true);
$this->assertEquals(
array('fooBar' => 'foobar'),
@@ -138,17 +172,17 @@ public function provideCallbacks()
},
),
'baz',
- array('foo' => '', 'bar' => 'baz'),
+ array('foo' => '', 'bar' => 'baz', 'baz' => true),
'Change a string',
),
array(
array(
'bar' => function ($bar) {
- return null;
+ return;
},
),
'baz',
- array('foo' => '', 'bar' => null),
+ array('foo' => '', 'bar' => null, 'baz' => true),
'Null an item'
),
array(
@@ -158,7 +192,7 @@ public function provideCallbacks()
},
),
new \DateTime('2011-09-10 06:30:00'),
- array('foo' => '', 'bar' => '10-09-2011 06:30:00'),
+ array('foo' => '', 'bar' => '10-09-2011 06:30:00', 'baz' => true),
'Format a date',
),
array(
@@ -172,8 +206,8 @@ public function provideCallbacks()
return $foos;
},
),
- array(new GetConstructorDummy('baz', ''), new GetConstructorDummy('quux', '')),
- array('foo' => '', 'bar' => 'bazquux'),
+ array(new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)),
+ array('foo' => '', 'bar' => 'bazquux', 'baz' => true),
'Collect a property',
),
array(
@@ -182,19 +216,37 @@ public function provideCallbacks()
return count($bars);
},
),
- array(new GetConstructorDummy('baz', ''), new GetConstructorDummy('quux', '')),
- array('foo' => '', 'bar' => 2),
+ array(new GetConstructorDummy('baz', '', false), new GetConstructorDummy('quux', '', false)),
+ array('foo' => '', 'bar' => 2, 'baz' => true),
'Count a property',
),
);
}
+
+ /**
+ * @expectedException \LogicException
+ * @expectedExceptionMessage Cannot normalize attribute "object" because injected serializer is not a normalizer
+ */
+ public function testUnableToNormalizeObjectAttribute()
+ {
+ $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface');
+ $this->normalizer->setSerializer($serializer);
+
+ $obj = new GetSetDummy();
+ $object = new \stdClass();
+ $obj->setObject($object);
+
+ $this->normalizer->normalize($obj, 'any');
+ }
}
class GetSetDummy
{
protected $foo;
private $bar;
+ private $baz;
protected $camelCase;
+ protected $object;
public function getFoo()
{
@@ -216,6 +268,16 @@ public function setBar($bar)
$this->bar = $bar;
}
+ public function isBaz()
+ {
+ return $this->baz;
+ }
+
+ public function setBaz($baz)
+ {
+ $this->baz = $baz;
+ }
+
public function getFooBar()
{
return $this->foo.$this->bar;
@@ -235,17 +297,67 @@ public function otherMethod()
{
throw new \RuntimeException("Dummy::otherMethod() should not be called");
}
+
+ public function setObject($object)
+ {
+ $this->object = $object;
+ }
+
+ public function getObject()
+ {
+ return $this->object;
+ }
}
class GetConstructorDummy
{
protected $foo;
private $bar;
+ private $baz;
+
+ public function __construct($foo, $bar, $baz)
+ {
+ $this->foo = $foo;
+ $this->bar = $bar;
+ $this->baz = $baz;
+ }
+
+ public function getFoo()
+ {
+ return $this->foo;
+ }
+
+ public function getBar()
+ {
+ return $this->bar;
+ }
+
+ public function isBaz()
+ {
+ return $this->baz;
+ }
+
+ public function otherMethod()
+ {
+ throw new \RuntimeException("Dummy::otherMethod() should not be called");
+ }
+}
+
+abstract class SerializerNormalizer implements SerializerInterface, NormalizerInterface
+{
+}
+
+class GetConstructorOptionalArgsDummy
+{
+ protected $foo;
+ private $bar;
+ private $baz;
- public function __construct($foo, $bar)
+ public function __construct($foo, $bar = array(), $baz = array())
{
$this->foo = $foo;
$this->bar = $bar;
+ $this->baz = $baz;
}
public function getFoo()
@@ -258,6 +370,11 @@ public function getBar()
return $this->bar;
}
+ public function getBaz()
+ {
+ return $this->baz;
+ }
+
public function otherMethod()
{
throw new \RuntimeException("Dummy::otherMethod() should not be called");
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/SerializerTest.php b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/SerializerTest.php
index 106bcff7adb59df082b4fff3195abe79c993822c..c2a231b11eef00f2a7d96f083b96181fb2f078e7 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -28,7 +28,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
public function testNormalizeNoMatch()
{
$this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
- $this->serializer->normalize(new \stdClass, 'xml');
+ $this->serializer->normalize(new \stdClass(), 'xml');
}
public function testNormalizeTraversable()
@@ -51,7 +51,7 @@ public function testNormalizeGivesPriorityToInterfaceOverTraversable()
public function testNormalizeOnDenormalizer()
{
$this->serializer = new Serializer(array(new TestDenormalizer()), array());
- $this->assertTrue($this->serializer->normalize(new \stdClass, 'json'));
+ $this->assertTrue($this->serializer->normalize(new \stdClass(), 'json'));
}
/**
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json b/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
index 704356623c83027ff0bcb53e954bc3281fdf7b4d..9e0fe096b07e7174b748bd60e4f6182b11cb2bf7 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "2.4-dev"
+ "dev-master": "2.5-dev"
}
}
}
diff --git a/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist b/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist
index 691219da83c16f99b346eb9336e4ea07dc228e60..aa28252cab78776856f9e02ff87ae3d9784ad704 100644
--- a/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist
+++ b/core/vendor/symfony/serializer/Symfony/Component/Serializer/phpunit.xml.dist
@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
- backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+ backupGlobals="false"
colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false"
- syntaxCheck="false"
bootstrap="vendor/autoload.php"
>
<testsuites>