mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 18:43:22 +01:00
Code Issues Releases Wiki Activity

Adding additionalProperites to JSON response parsing

Browse Source
This commit is contained in:
Michael Dowling 2013-12-03 17:39:15 -08:00
parent 16445d5ff8
commit 03e0ac9622
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Guzzle/Service/Command/LocationVisitor/Response/JsonVisitor.php
View File

@ -79,6 +79,11 @@ class JsonVisitor extends AbstractResponseVisitor
// Remove any unknown and potentially unsafe properties
if ($param->getAdditionalProperties() === false) {
$value = array_intersect_key($value, $knownProperties);
} elseif (($additional = $param->getAdditionalProperties()) !== true) {
// Validate and filter additional properties
foreach ($value as &$v) {
$this->recursiveProcess($additional, $v);
}
}
}
}

20
tests/Guzzle/Tests/Service/Command/LocationVisitor/Response/JsonVisitorTest.php
View File

@ -134,4 +134,24 @@ class JsonVisitorTest extends AbstractResponseVisitorTest
$this->assertEquals(array('foo' => array('bar' => 15)), $this->value);
}
public function testWalksAdditionalProperties()
{
$visitor = new Visitor();
$param = new Parameter(array(
'name' => 'foo',
'type' => 'object',
'additionalProperties' => array(
'type' => 'object',
'properties' => array(
'bar' => array(
'type' => 'string',
'filters' => array('base64_decode')
)
),
),
));
$this->value = array('foo' => array('baz' => array('bar' => 'Zm9v')));
$visitor->visit($this->command, $this->response, $param, $this->value);
$this->assertEquals('foo', $this->value['foo']['baz']['bar']);
}
}