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

New definition of complex type

Browse Source 
The exposure of complex type properties was done only with public property.
Now you can expose properties and public methods.

Before:
  In a complex type:
    /**
     * @var string
     */
   public $var;

After:
  In a complex type:
    use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap;

    /**
     * @Soap\PropertyComplexType("string", name="var", nillable="true")
     */
    public $username;

    private $email;

    /**
     * @Soap\MethodComplexType("string", name="email", nillable="true", setter="setEmail")
     */
    public function getEmail()
    {
        return $this->email;
    }

    public function setEmail($email)
    {
        $this->email = $email;
    }

name, nillable are optionnal.
setter is optional and only available for MethodComplexType.
This commit is contained in:
Francis Besset
2011-07-23 20:06:42 +02:00
parent 9bd9677325
commit 4fa893042f
19 changed files with 592 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ServiceBinding/MessageBinderInterface.php
View File

@ -20,5 +20,5 @@ interface MessageBinderInterface
*
* @return mixed
*/
function processMessage(Method $messageDefinition, $message);
function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array());
}

62
ServiceBinding/RpcLiteralRequestMessageBinder.php
View File

@ -11,16 +11,42 @@
namespace BeSimple\SoapBundle\ServiceBinding;
use BeSimple\SoapBundle\ServiceDefinition\Method;
use BeSimple\SoapBundle\ServiceDefinition\Strategy\MethodComplexType;
use BeSimple\SoapBundle\ServiceDefinition\Strategy\PropertyComplexType;
class RpcLiteralRequestMessageBinder implements MessageBinderInterface
{
public function processMessage(Method $messageDefinition, $message)
public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array())
{
$result = array();
$i = 0;
foreach($messageDefinition->getArguments() as $argument) {
if (isset($message[$i])) {
if (preg_match('/^([^\[]+)\[\]$/', $argument->getType()->getPhpType(), $match)) {
$isArray = true;
$type = $match[1];
} else {
$isArray = false;
$type = $argument->getType()->getPhpType();
}
if (isset($definitionComplexTypes[$type])) {
if ($isArray) {
$array = array();
foreach ($message[$i]->item as $complexType) {
$array[] = $this->getInstanceOfType($type, $complexType, $definitionComplexTypes);
}
$message[$i] = $array;
} else {
$message[$i] = $this->getInstanceOfType($type, $message[$i], $definitionComplexTypes);
}
} elseif ($isArray) {
$message[$i] = $message[$i]->item;
}
$result[$argument->getName()] = $message[$i];
}
@ -29,4 +55,38 @@ class RpcLiteralRequestMessageBinder implements MessageBinderInterface
return $result;
}
private function getInstanceOfType($type, $message, array $definitionComplexTypes)
{
$typeClass = $type;
$instanceType = new $typeClass();
foreach ($definitionComplexTypes[$type] as $type) {
if ($type instanceof PropertyComplexType) {
if (isset($definitionComplexTypes[$type->getValue()])) {
$value = $this->getInstanceOfType($type->getValue(), $message->{$type->getName()}, $definitionComplexTypes);
} else {
$value = $message->{$type->getName()};
}
$instanceType->{$type->getOriginalName()} = $value;
} elseif ($type instanceof MethodComplexType) {
if (!$type->getSetter()) {
throw new \LogicException();
}
if (isset($definitionComplexTypes[$type->getValue()])) {
$value = $this->getInstanceOfType($type->getValue(), $message->{$type->getName()}, $definitionComplexTypes);
} else {
$value = $message->{$type->getName()};
}
$instanceType->{$type->getSetter()}($value);
} else {
throw new \InvalidArgumentException();
}
}
return $instanceType;
}
}

55
ServiceBinding/RpcLiteralResponseMessageBinder.php
View File

@ -11,11 +11,64 @@
namespace BeSimple\SoapBundle\ServiceBinding;
use BeSimple\SoapBundle\ServiceDefinition\Method;
use BeSimple\SoapBundle\ServiceDefinition\Strategy\PropertyComplexType;
use BeSimple\SoapBundle\ServiceDefinition\Strategy\MethodComplexType;
class RpcLiteralResponseMessageBinder implements MessageBinderInterface
{
public function processMessage(Method $messageDefinition, $message)
public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array())
{
$return = $messageDefinition->getReturn();
$class = $return->getPhpType();
if (preg_match('/^([^\[]+)\[\]$/', $class, $match)) {
$isArray = true;
$type =
$class = $match[1];
} else {
$isArray = false;
$type = $return->getPhpType();
}
if (isset($definitionComplexTypes[$type])) {
if ($class[0] == '\\') {
$class = substr($class, 1);
}
if ($isArray) {
$array = array();
foreach ($message as $complexType) {
$array[] = $this->getInstanceOfStdClass($type, $class, $complexType, $definitionComplexTypes);
}
$message = $array;
} else {
$message = $this->getInstanceOfStdClass($type, $class, $message, $definitionComplexTypes);
}
}
return $message;
}
private function getInstanceOfStdClass($type, $class, $message, $definitionComplexTypes)
{
if (get_class($message) !== $class) {
throw new \InvalidArgumentException();
}
$stdClass = new \stdClass();
foreach ($definitionComplexTypes[$type] as $type) {
if ($type instanceof PropertyComplexType) {
$stdClass->{$type->getName()} = $message->{$type->getOriginalName()};
} elseif ($type instanceof MethodComplexType) {
$stdClass->{$type->getName()} = $message->{$type->getOriginalName()}();
} else {
throw new \InvalidArgumentException();
}
}
return $stdClass;
}
}

4
ServiceBinding/ServiceBinder.php
View File

@ -61,7 +61,7 @@ class ServiceBinder
$result = array();
$result['_controller'] = $methodDefinition->getController();
$result = array_merge($result, $this->requestMessageBinder->processMessage($methodDefinition, $arguments));
$result = array_merge($result, $this->requestMessageBinder->processMessage($methodDefinition, $arguments, $this->definition->getDefinitionComplexTypes()));
return $result;
}
@ -70,7 +70,7 @@ class ServiceBinder
{
$methodDefinition = $this->definition->getMethods()->get($name);
return $this->responseMessageBinder->processMessage($methodDefinition, $return);
return $this->responseMessageBinder->processMessage($methodDefinition, $return, $this->definition->getDefinitionComplexTypes());
}
protected function createSoapHeader(Header $headerDefinition, $data)