From ba0855a2379193309b5caa4a780e20d0c55b7ac4 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Sun, 24 Jul 2011 10:56:07 +0200 Subject: [PATCH] Fixed typo --- .../RpcLiteralRequestMessageBinder.php | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/ServiceBinding/RpcLiteralRequestMessageBinder.php b/ServiceBinding/RpcLiteralRequestMessageBinder.php index c349b73..11d7430 100644 --- a/ServiceBinding/RpcLiteralRequestMessageBinder.php +++ b/ServiceBinding/RpcLiteralRequestMessageBinder.php @@ -16,71 +16,71 @@ use BeSimple\SoapBundle\ServiceDefinition\Strategy\PropertyComplexType; class RpcLiteralRequestMessageBinder implements MessageBinderInterface { + private $definitionComplexTypes; + public function processMessage(Method $messageDefinition, $message, array $definitionComplexTypes = array()) { + $this->definitionComplexTypes = $definitionComplexTypes; + $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]; + $result[$argument->getName()] = $this->processType($argument->getType()->getPhpType(), $message[$i]); } $i++; } + $this->definitionComplexTypes = array(); + return $result; } - private function getInstanceOfType($type, $message, array $definitionComplexTypes) + private function processType($phpType, $message) { - $typeClass = $type; - $instanceType = new $typeClass(); + if (preg_match('/^([^\[]+)\[\]$/', $phpType, $match)) { + $isArray = true; + $type = $match[1]; + } else { + $isArray = false; + $type = $phpType; + } - 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()}; + if (isset($this->definitionComplexTypes[$type])) { + if ($isArray) { + $array = array(); + + foreach ($message->item as $complexType) { + $array[] = $this->getInstanceOfType($type, $complexType); } + $message = $array; + } else { + $message = $this->getInstanceOfType($type, $message); + } + } elseif ($isArray) { + $message = $message->item; + } + + return $message; + } + + private function getInstanceOfType($phpType, $message) + { + $instanceType = new $phpType(); + + foreach ($this->definitionComplexTypes[$phpType] as $type) { + $value = $this->processType($type->getValue(), $message->{$type->getName()}); + + if ($type instanceof PropertyComplexType) { $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();