Cadoles/BeSimpleSoap
20
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sarunas/BeSimpleSoapBundle into sarunas-master

Browse Source 
Conflicts:
	ServiceBinding/RpcLiteralResponseMessageBinder.php
This commit is contained in:
Francis Besset 2012-01-12 11:53:58 +01:00
commit e291afcba1
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ServiceBinding/RpcLiteralRequestMessageBinder.php
View File

@ -96,12 +96,14 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
$value = $p->getValue($message); $value = $p->getValue($message);
} }
$value = $this->processType($type->getValue(), $value); if (null !== $value) {
$value = $this->processType($type->getValue(), $value);
if ($p->isPublic()) { if ($p->isPublic()) {
$message->{$type->getName()} = $value; $message->{$type->getName()} = $value;
} else { } else {
$p->setValue($message, $value); $p->setValue($message, $value);
}
} }
if (!$type->isNillable() && null === $value) { if (!$type->isNillable() && null === $value) {
@ -111,4 +113,4 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
return $message; return $message;
} }
} }

12
ServiceBinding/RpcLiteralResponseMessageBinder.php
View File

@ -81,12 +81,14 @@ class RpcLiteralResponseMessageBinder implements MessageBinderInterface
$value = $p->getValue($message); $value = $p->getValue($message);
} }
$value = $this->processType($type->getValue(), $value); if (null !== $value) {
$value = $this->processType($type->getValue(), $value);
if ($p->isPublic()) { if ($p->isPublic()) {
$message->{$type->getName()} = $value; $message->{$type->getName()} = $value;
} else { } else {
$p->setValue($message, $value); $p->setValue($message, $value);
}
} }
if (!$type->isNillable() && null === $value) { if (!$type->isNillable() && null === $value) {

2
Tests/ServiceBinding/RpcLiteralRequestMessageBinderTest.php
View File

@ -133,7 +133,7 @@ class RpcLiteralRequestMessageBinderTest extends \PHPUnit_Framework_TestCase
); );
$result = $result['simple_arrays']; $result = $result['simple_arrays'];
$this->assertEquals(array(), $result->array1); $this->assertEquals(null, $result->array1);
$this->assertEquals(array(), $result->getArray2()); $this->assertEquals(array(), $result->getArray2());
$this->assertEquals($array, $result->getArray3()); $this->assertEquals($array, $result->getArray3());
} }