From 438f325893a1bd9ba65f61933cdc350ebabe2c8e Mon Sep 17 00:00:00 2001 From: Asmir Mustafic Date: Mon, 16 May 2016 20:22:12 +0200 Subject: [PATCH] PSR and fixes --- phpunit.xml.dist | 4 +- src/DefinitionsReader.php | 106 +++++++++----------- src/Events/Binding/FaultEvent.php | 5 +- src/Events/Binding/MessageEvent.php | 30 ++++-- src/Events/Binding/OperationEvent.php | 4 +- src/Events/BindingEvent.php | 2 +- src/Events/DefinitionsEvent.php | 2 +- src/Events/Message/PartEvent.php | 4 +- src/Events/MessageEvent.php | 2 +- src/Events/PortType/FaultEvent.php | 5 +- src/Events/PortType/OperationEvent.php | 4 +- src/Events/PortType/ParamEvent.php | 5 +- src/Events/PortTypeEvent.php | 2 +- src/Events/ServiceEvent.php | 2 +- src/Events/WsdlEvent.php | 1 + src/Wsdl/Binding.php | 5 +- src/Wsdl/Binding/Operation.php | 16 ++- src/Wsdl/Binding/OperationFault.php | 2 + src/Wsdl/Binding/OperationMessage.php | 2 + src/Wsdl/Definitions.php | 10 ++ src/Wsdl/Documented.php | 1 + src/Wsdl/ExtensibilityElement.php | 7 +- src/Wsdl/ExtensibleAttributesDocumented.php | 2 +- src/Wsdl/ExtensibleDocumented.php | 2 +- src/Wsdl/Message.php | 5 +- src/Wsdl/Message/Part.php | 16 ++- src/Wsdl/PortType.php | 5 +- src/Wsdl/PortType/Fault.php | 3 + src/Wsdl/PortType/Operation.php | 6 ++ src/Wsdl/PortType/Param.php | 3 + src/Wsdl/Service.php | 4 +- src/Wsdl/Service/Port.php | 5 +- tests/BaseTest.php | 10 +- tests/EventsTest.php | 45 ++++----- 34 files changed, 196 insertions(+), 131 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 05db0e5..5723bf7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,13 +2,13 @@ - + ./tests/ - + src diff --git a/src/DefinitionsReader.php b/src/DefinitionsReader.php index 3a57479..75f9fb2 100644 --- a/src/DefinitionsReader.php +++ b/src/DefinitionsReader.php @@ -3,38 +3,38 @@ use DOMDocument; use DOMElement; +use GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent as BindingOperationFaultEvent; +use GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent as BindingOperationMessageEvent; +use GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent as BindingOperationEvent; +use GoetasWebservices\XML\WSDLReader\Events\BindingEvent; +use GoetasWebservices\XML\WSDLReader\Events\DefinitionsEvent; +use GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent as MessagePartEvent; +use GoetasWebservices\XML\WSDLReader\Events\MessageEvent; +use GoetasWebservices\XML\WSDLReader\Events\PortType\FaultEvent; +use GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent; +use GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent; +use GoetasWebservices\XML\WSDLReader\Events\PortTypeEvent; +use GoetasWebservices\XML\WSDLReader\Events\Service\PortEvent; +use GoetasWebservices\XML\WSDLReader\Events\ServiceEvent; +use GoetasWebservices\XML\WSDLReader\Wsdl\Binding; +use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation as BindingOperation; +use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationFault as BindingOperationFault; +use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationMessage as BindingOperationMessage; use GoetasWebservices\XML\WSDLReader\Wsdl\Definitions; use GoetasWebservices\XML\WSDLReader\Wsdl\Message; +use GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part; use GoetasWebservices\XML\WSDLReader\Wsdl\PortType; +use GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Fault; use GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation; use GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Param; -use GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Fault; use GoetasWebservices\XML\WSDLReader\Wsdl\Service; -use GoetasWebservices\XML\WSDLReader\Wsdl\Binding; -use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation as BindingOperation; -use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationMessage as BindingOperationMessage; -use GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationFault as BindingOperationFault; -use GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part; use GoetasWebservices\XML\WSDLReader\Wsdl\Service\Port; -use GoetasWebservices\XML\XSDReader\Utils\UrlUtils; use GoetasWebservices\XML\XSDReader\Schema\Schema; use GoetasWebservices\XML\XSDReader\SchemaReader; -use GoetasWebservices\XML\WSDLReader\Events\DefinitionsEvent; +use GoetasWebservices\XML\XSDReader\Utils\UrlUtils; use Symfony\Component\EventDispatcher\Event; -use GoetasWebservices\XML\WSDLReader\Events\MessageEvent; -use GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent as MessagePartEvent; -use GoetasWebservices\XML\WSDLReader\Events\PortTypeEvent; -use GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent; -use GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent; -use GoetasWebservices\XML\WSDLReader\Events\PortType\FaultEvent; -use GoetasWebservices\XML\WSDLReader\Events\BindingEvent; -use GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent as BindingOperationEvent; -use GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent as BindingOperationMessageEvent; -use GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent as BindingOperationFaultEvent; -use GoetasWebservices\XML\WSDLReader\Events\ServiceEvent; -use GoetasWebservices\XML\WSDLReader\Events\Service\PortEvent; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; class DefinitionsReader { @@ -59,8 +59,8 @@ class DefinitionsReader public function __construct(SchemaReader $reader = null, EventDispatcherInterface $dispatcher = null) { - $this->reader = $reader ? : new SchemaReader(); - $this->dispatcher = $dispatcher ? : new EventDispatcher(); + $this->reader = $reader ?: new SchemaReader(); + $this->dispatcher = $dispatcher ?: new EventDispatcher(); } /** @@ -83,7 +83,7 @@ private function loop(DOMElement $node) { $childs = array(); foreach ($node->childNodes as $childNode) { - if (! ($childNode instanceof DOMElement) || $childNode->namespaceURI !== self::WSDL_NS) { + if (!($childNode instanceof DOMElement) || $childNode->namespaceURI !== self::WSDL_NS) { continue; } $childs[] = $childNode; @@ -137,10 +137,9 @@ private function rootNode(Definitions $definitions, DOMElement $node, Definition break; } } - ksort($functions); + ksort($functions); return array( - function () use ($functions, $definitions, $node) - { + function () use ($functions, $definitions, $node) { $this->dispatcher->dispatch('definitions_start', new DefinitionsEvent($definitions, $node)); foreach ($functions as $subFunctions) { foreach ($subFunctions as $function) { @@ -177,8 +176,7 @@ private function loadBinding(Definitions $definitions, DOMElement $node) break; } } - return function () use ($functions, $binding, $definitions, $node) - { + return function () use ($functions, $binding, $definitions, $node) { list ($name, $ns) = self::splitParts($node, $node->getAttribute("type")); $binding->setType($definitions->findPortType($name, $ns)); @@ -209,8 +207,7 @@ private function loadBindingOperation(Binding $binding, DOMElement $node) break; } } - return function () use ($functions, $bindingOperation, $node) - { + return function () use ($functions, $bindingOperation, $node) { $this->dispatcher->dispatch('binding.operation', new BindingOperationEvent($bindingOperation, $node)); foreach ($functions as $function) { call_user_func($function); @@ -228,9 +225,8 @@ private function loadBindingOperationMessage(BindingOperation $bindingOperation, $bindingOperation->setOutput($message); } - return function () use ($message, $node) - { - $this->dispatcher->dispatch('binding.operation.message', new BindingOperationMessageEvent($message, $node)); + return function () use ($message, $node, $isInput) { + $this->dispatcher->dispatch('binding.operation.message', new BindingOperationMessageEvent($message, $node, $isInput ? 'input' : 'output')); }; } @@ -240,8 +236,7 @@ private function loadBindingOperationFault(BindingOperation $bindingOperation, D $fault->setDocumentation($this->getDocumentation($node)); $bindingOperation->addFault($fault); - return function () use ($fault, $node) - { + return function () use ($fault, $node) { $this->dispatcher->dispatch('binding.operation.fault', new BindingOperationFaultEvent($fault, $node)); }; } @@ -260,8 +255,7 @@ private function loadService(Definitions $definitions, DOMElement $node) break; } } - return function () use ($functions, $service, $node) - { + return function () use ($functions, $service, $node) { $this->dispatcher->dispatch('service', new ServiceEvent($service, $node)); foreach ($functions as $function) { call_user_func($function); @@ -284,8 +278,7 @@ private function loadMessage(Definitions $definitions, DOMElement $node) } } - return function () use ($functions, $message, $node) - { + return function () use ($functions, $message, $node) { $this->dispatcher->dispatch('message', new MessageEvent($message, $node)); foreach ($functions as $function) { call_user_func($function); @@ -298,8 +291,7 @@ private function loadPort(Service $service, DOMElement $node) $port = new Port($service, $node->getAttribute("name")); $port->setDocumentation($this->getDocumentation($node)); $service->addPort($port); - return function () use ($port, $service, $node) - { + return function () use ($port, $service, $node) { list ($name, $ns) = self::splitParts($node, $node->getAttribute("binding")); $port->setBinding($service->getDefinition() ->findBinding($name, $ns)); @@ -321,8 +313,7 @@ private function loadPortType(Definitions $definitions, DOMElement $node) break; } } - return function () use ($functions, $port, $node) - { + return function () use ($functions, $port, $node) { $this->dispatcher->dispatch('portType', new PortTypeEvent($port, $node)); foreach ($functions as $function) { call_user_func($function); @@ -334,7 +325,7 @@ private function loadPortTypeOperation(PortType $port, DOMElement $node) { $operation = new Operation($port, $node->getAttribute("name")); $operation->setDocumentation($this->getDocumentation($node)); - $operation->setParameterOrder($node->getAttribute("parameterOrder") ? : null); + $operation->setParameterOrder($node->getAttribute("parameterOrder") ?: null); $port->addOperation($operation); $functions = array(); @@ -351,8 +342,7 @@ private function loadPortTypeOperation(PortType $port, DOMElement $node) break; } } - return function () use ($functions, $operation, $node) - { + return function () use ($functions, $operation, $node) { $this->dispatcher->dispatch('portType.operation', new OperationEvent($operation, $node)); foreach ($functions as $function) { call_user_func($function); @@ -371,8 +361,7 @@ private function loadParam(Operation $operation, DOMElement $node, $in = true) $operation->setOutput($param); } - return function () use ($param, $operation, $node) - { + return function () use ($param, $operation, $node) { list ($name, $ns) = self::splitParts($node, $node->getAttribute("message")); $param->setMessage($operation->getDefinition() ->findMessage($name, $ns)); @@ -386,8 +375,7 @@ private function loadFault(Operation $operation, DOMElement $node) $fault->setDocumentation($this->getDocumentation($node)); $operation->addFault($fault); - return function () use ($fault, $operation, $node) - { + return function () use ($fault, $operation, $node) { list ($name, $ns) = self::splitParts($node, $node->getAttribute("message")); $fault->setMessage($operation->getDefinition()->findMessage($name, $ns)); @@ -401,8 +389,7 @@ private function loadMessagePart(Message $message, DOMElement $node) $part->setDocumentation($this->getDocumentation($node)); $message->addPart($part); - return function () use ($part, $node) - { + return function () use ($part, $node) { if ($node->hasAttribute("element")) { list ($name, $ns) = self::splitParts($node, $node->getAttribute("element")); $part->setElement($part->getDefinition() @@ -439,11 +426,11 @@ private function loadImport(Definitions $definitions, DOMElement $node) $file = UrlUtils::resolveRelativeUrl($node->ownerDocument->documentURI, $node->getAttribute("location")); if (isset($this->loadedFiles[$file])) { $definitions->addImport($this->loadedFiles[$file]); - return function () - {}; + return function () { + }; } - if (! $node->getAttribute("namespace")) { + if (!$node->getAttribute("namespace")) { $this->loadedFiles[$file] = $newDefinitions = $definitions; } else { $this->loadedFiles[$file] = $newDefinitions = new Definitions(); @@ -460,8 +447,7 @@ private function loadImport(Definitions $definitions, DOMElement $node) $definitions->addImport($newDefinitions); } - return function () use ($callbacks) - { + return function () use ($callbacks) { foreach ($callbacks as $callback) { call_user_func($callback); } @@ -496,7 +482,7 @@ public function readNode(\DOMElement $node, $file = 'wsdl.xsd') public function readString($content, $file = 'wsdl.xsd') { $xml = new DOMDocument('1.0', 'UTF-8'); - if (! $xml->loadXML($content)) { + if (!$xml->loadXML($content)) { throw new IOException("Can't load the wsdl"); } $xml->documentURI = $file; @@ -523,7 +509,7 @@ public function readFile($file) private function getDOM($file) { $xml = new DOMDocument('1.0', 'UTF-8'); - if (! $xml->load($file)) { + if (!$xml->load($file)) { throw new IOException("Can't load the file $file"); } return $xml; diff --git a/src/Events/Binding/FaultEvent.php b/src/Events/Binding/FaultEvent.php index 18e580c..607e9ee 100644 --- a/src/Events/Binding/FaultEvent.php +++ b/src/Events/Binding/FaultEvent.php @@ -1,10 +1,9 @@ Fault = $Fault; + $this->message = $message; + $this->type = $type; } /** @@ -22,7 +29,16 @@ public function __construct(OperationMessage $Fault, \DOMElement $node) */ public function getOperationMessage() { - return $this->Fault; + return $this->message; + } + + /** + * @return string + */ + public function getType() + { + return $this->type; } } + diff --git a/src/Events/Binding/OperationEvent.php b/src/Events/Binding/OperationEvent.php index bab1a6c..494a479 100644 --- a/src/Events/Binding/OperationEvent.php +++ b/src/Events/Binding/OperationEvent.php @@ -1,9 +1,9 @@ node = $node; } + /** * @return \DOMElement */ diff --git a/src/Wsdl/Binding.php b/src/Wsdl/Binding.php index c70d6b3..0902b3a 100644 --- a/src/Wsdl/Binding.php +++ b/src/Wsdl/Binding.php @@ -36,6 +36,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding @@ -54,6 +55,7 @@ public function getType() { return $this->type; } + /** * @param $type string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType @@ -65,7 +67,6 @@ public function setType(PortType $type) } - /** * @param $operation \GoetasWebservices\XML\WSDLReader\Wsdl\BindingOperation */ @@ -74,6 +75,7 @@ public function addOperation(\GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Oper $this->operation[$operation->getName()] = $operation; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation */ @@ -81,6 +83,7 @@ public function getOperation($name) { return $this->operation[$name]; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation[] */ diff --git a/src/Wsdl/Binding/Operation.php b/src/Wsdl/Binding/Operation.php index 8696df9..9a1b29d 100644 --- a/src/Wsdl/Binding/Operation.php +++ b/src/Wsdl/Binding/Operation.php @@ -1,8 +1,9 @@ name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation @@ -63,6 +65,7 @@ public function getInput() { return $this->input; } + /** * @param $input \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationMessage * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation @@ -81,6 +84,7 @@ public function getOutput() { return $this->output; } + /** * @param $output \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationMessage * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operation @@ -99,6 +103,7 @@ public function addFault(\GoetasWebservices\XML\WSDLReader\Wsdl\Binding\Operatio $this->fault[$fault->getName()] = $fault; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationFault[] */ @@ -106,6 +111,7 @@ public function getFaults() { return $this->fault; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding */ @@ -114,4 +120,12 @@ public function getBinding() return $this->binding; } + /** + * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation + */ + public function getPortTypeOperation() + { + return $this->binding->getType()->getOperation($this->name); + } + } diff --git a/src/Wsdl/Binding/OperationFault.php b/src/Wsdl/Binding/OperationFault.php index d889290..4e8ac4c 100644 --- a/src/Wsdl/Binding/OperationFault.php +++ b/src/Wsdl/Binding/OperationFault.php @@ -2,6 +2,7 @@ namespace GoetasWebservices\XML\WSDLReader\Wsdl\Binding; use GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibleDocumented; + /** * XSD Type: tBindingOperationFault */ @@ -33,6 +34,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationFault diff --git a/src/Wsdl/Binding/OperationMessage.php b/src/Wsdl/Binding/OperationMessage.php index d94f479..c6dce41 100644 --- a/src/Wsdl/Binding/OperationMessage.php +++ b/src/Wsdl/Binding/OperationMessage.php @@ -2,6 +2,7 @@ namespace GoetasWebservices\XML\WSDLReader\Wsdl\Binding; use GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibleDocumented; + /** * XSD Type: tBindingOperationMessage */ @@ -34,6 +35,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding\OperationMessage diff --git a/src/Wsdl/Definitions.php b/src/Wsdl/Definitions.php index 1ece117..ceec4e0 100644 --- a/src/Wsdl/Definitions.php +++ b/src/Wsdl/Definitions.php @@ -2,6 +2,7 @@ namespace GoetasWebservices\XML\WSDLReader\Wsdl; use GoetasWebservices\XML\XSDReader\Schema\Schema; + /** * XSD Type: tDefinitions */ @@ -60,6 +61,7 @@ public function getTargetNamespace() { return $this->targetNamespace; } + /** * @param $targetNamespace string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\TDefinitions @@ -78,6 +80,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\TDefinitions @@ -134,6 +137,7 @@ public function addMessage(\GoetasWebservices\XML\WSDLReader\Wsdl\Message $messa $this->message[$message->getName()] = $message; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message */ @@ -143,6 +147,7 @@ public function getMessage($name) return $this->message[$name]; } } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message[] */ @@ -184,6 +189,7 @@ public function addBinding(\GoetasWebservices\XML\WSDLReader\Wsdl\Binding $bindi $this->binding[$binding->getName()] = $binding; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding */ @@ -193,6 +199,7 @@ public function getBinding($name) return $this->binding[$name]; } } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Binding[] */ @@ -209,6 +216,7 @@ public function addService(\GoetasWebservices\XML\WSDLReader\Wsdl\Service $servi $this->service[$service->getName()] = $service; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Service */ @@ -218,6 +226,7 @@ public function getService($name) return $this->service[$name]; } } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Service[] */ @@ -255,6 +264,7 @@ public function findService($name, $namespace = null) { return $this->findSomething('getService', $name, $namespace); } + /** * @param string $name * @param string $namespace diff --git a/src/Wsdl/Documented.php b/src/Wsdl/Documented.php index 201ec3d..ca4d906 100644 --- a/src/Wsdl/Documented.php +++ b/src/Wsdl/Documented.php @@ -22,6 +22,7 @@ public function getDocumentation() { return $this->documentation; } + /** * @param $documentation string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Documented diff --git a/src/Wsdl/ExtensibilityElement.php b/src/Wsdl/ExtensibilityElement.php index 4f09c55..cb08b0f 100644 --- a/src/Wsdl/ExtensibilityElement.php +++ b/src/Wsdl/ExtensibilityElement.php @@ -11,8 +11,8 @@ abstract class ExtensibilityElement * @var boolean */ protected $required; - - + + /** * @return boolean */ @@ -20,6 +20,7 @@ public function getRequired() { return $this->required; } + /** * @param $required boolean * @return \GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibilityElement @@ -29,5 +30,5 @@ public function setRequired($required) $this->required = $required; return $this; } - + } diff --git a/src/Wsdl/ExtensibleAttributesDocumented.php b/src/Wsdl/ExtensibleAttributesDocumented.php index e4634a2..9d536ae 100644 --- a/src/Wsdl/ExtensibleAttributesDocumented.php +++ b/src/Wsdl/ExtensibleAttributesDocumented.php @@ -7,5 +7,5 @@ abstract class ExtensibleAttributesDocumented extends Documented { - + } diff --git a/src/Wsdl/ExtensibleDocumented.php b/src/Wsdl/ExtensibleDocumented.php index b895fac..a7d172b 100644 --- a/src/Wsdl/ExtensibleDocumented.php +++ b/src/Wsdl/ExtensibleDocumented.php @@ -7,5 +7,5 @@ abstract class ExtensibleDocumented extends Documented { - + } diff --git a/src/Wsdl/Message.php b/src/Wsdl/Message.php index 1003711..169c031 100644 --- a/src/Wsdl/Message.php +++ b/src/Wsdl/Message.php @@ -31,6 +31,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message @@ -54,6 +55,7 @@ public function addPart(\GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part $par return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part[] */ @@ -61,12 +63,13 @@ public function getParts() { return $this->part; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part */ public function getPart($name) { - return $this->part[$name]; + return $this->part[$name]; } } diff --git a/src/Wsdl/Message/Part.php b/src/Wsdl/Message/Part.php index 858bbd5..12f9ecb 100644 --- a/src/Wsdl/Message/Part.php +++ b/src/Wsdl/Message/Part.php @@ -1,10 +1,11 @@ message = $message; } + /** + * @return Message + */ + public function getMessage() + { + return $this->message; + } + /** * @return string */ @@ -45,6 +54,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part @@ -63,6 +73,7 @@ public function getElement() { return $this->element; } + /** * @param $element string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part @@ -81,6 +92,7 @@ public function getType() { return $this->type; } + /** * @param $type string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Message\Part diff --git a/src/Wsdl/PortType.php b/src/Wsdl/PortType.php index e2c98c6..81e3dbb 100644 --- a/src/Wsdl/PortType.php +++ b/src/Wsdl/PortType.php @@ -22,6 +22,7 @@ public function __construct(Definitions $def, $name) parent::__construct($def); $this->name = $name; } + /** * @return string */ @@ -29,6 +30,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType @@ -40,7 +42,6 @@ public function setName($name) } - /** * @param $operation \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation */ @@ -49,6 +50,7 @@ public function addOperation(\GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Ope $this->operation[$operation->getName()] = $operation; return $this; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation */ @@ -56,6 +58,7 @@ public function getOperation($name) { return $this->operation[$name]; } + /** * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation[] */ diff --git a/src/Wsdl/PortType/Fault.php b/src/Wsdl/PortType/Fault.php index 4520d09..830fe7c 100644 --- a/src/Wsdl/PortType/Fault.php +++ b/src/Wsdl/PortType/Fault.php @@ -3,6 +3,7 @@ use GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibleAttributesDocumented; use GoetasWebservices\XML\WSDLReader\Wsdl\Message; + /** * XSD Type: tFault */ @@ -41,6 +42,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Fault @@ -59,6 +61,7 @@ public function getMessage() { return $this->message; } + /** * @param $message Message * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Fault diff --git a/src/Wsdl/PortType/Operation.php b/src/Wsdl/PortType/Operation.php index 0e1802b..f562b50 100644 --- a/src/Wsdl/PortType/Operation.php +++ b/src/Wsdl/PortType/Operation.php @@ -3,6 +3,7 @@ use GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibleDocumented; use GoetasWebservices\XML\WSDLReader\Wsdl\PortType; + /** * XSD Type: tOperation */ @@ -54,6 +55,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation @@ -72,6 +74,7 @@ public function getParameterOrder() { return $this->parameterOrder; } + /** * @param $parameterOrder string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation @@ -90,6 +93,7 @@ public function getInput() { return $this->input; } + /** * @param $input \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Param * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation @@ -108,6 +112,7 @@ public function getOutput() { return $this->output; } + /** * @param $output \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Param * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation @@ -133,6 +138,7 @@ public function getFaults() { return $this->fault; } + /** * @param $fault \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Fault * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Operation diff --git a/src/Wsdl/PortType/Param.php b/src/Wsdl/PortType/Param.php index be7db24..36202f5 100644 --- a/src/Wsdl/PortType/Param.php +++ b/src/Wsdl/PortType/Param.php @@ -3,6 +3,7 @@ use GoetasWebservices\XML\WSDLReader\Wsdl\ExtensibleAttributesDocumented; use GoetasWebservices\XML\WSDLReader\Wsdl\Message; + /** * XSD Type: tParam */ @@ -37,6 +38,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Param @@ -55,6 +57,7 @@ public function getMessage() { return $this->message; } + /** * @param $message string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\PortType\Param diff --git a/src/Wsdl/Service.php b/src/Wsdl/Service.php index 7a82467..ead6653 100644 --- a/src/Wsdl/Service.php +++ b/src/Wsdl/Service.php @@ -18,7 +18,6 @@ class Service extends ExtensibleDocumented protected $port = array(); - public function __construct(Definitions $def, $name) { parent::__construct($def); @@ -32,6 +31,7 @@ public function getName() { return $this->name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Service @@ -43,7 +43,6 @@ public function setName($name) } - /** * @param $port \GoetasWebservices\XML\WSDLReader\Wsdl\Service\Port */ @@ -52,6 +51,7 @@ public function addPort(\GoetasWebservices\XML\WSDLReader\Wsdl\Service\Port $por $this->port[$port->getName()] = $port; return $this; } + public function getPort($name) { return $this->port[$name]; diff --git a/src/Wsdl/Service/Port.php b/src/Wsdl/Service/Port.php index 3b120dc..1b0b29b 100644 --- a/src/Wsdl/Service/Port.php +++ b/src/Wsdl/Service/Port.php @@ -1,9 +1,10 @@ name; } + /** * @param $name string * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Port @@ -55,6 +57,7 @@ public function getBinding() { return $this->binding; } + /** * @param $binding \GoetasWebservices\XML\WSDLReader\Wsdl\Binding * @return \GoetasWebservices\XML\WSDLReader\Wsdl\Port diff --git a/tests/BaseTest.php b/tests/BaseTest.php index 1adf95c..61c54e6 100644 --- a/tests/BaseTest.php +++ b/tests/BaseTest.php @@ -20,7 +20,7 @@ public function setUp() public function testReadFile() { - $definitions = $this->reader->readFile(__DIR__.'/resources/base-wsdl.wsdl'); + $definitions = $this->reader->readFile(__DIR__ . '/resources/base-wsdl.wsdl'); $this->assertInstanceOf('GoetasWebservices\XML\WSDLReader\Wsdl\Definitions', $definitions); $this->makeAssertionsLoad($definitions); @@ -28,7 +28,7 @@ public function testReadFile() public function testReadString() { - $definitions = $this->reader->readString(file_get_contents(__DIR__.'/resources/base-wsdl.wsdl')); + $definitions = $this->reader->readString(file_get_contents(__DIR__ . '/resources/base-wsdl.wsdl')); $this->assertInstanceOf('GoetasWebservices\XML\WSDLReader\Wsdl\Definitions', $definitions); $this->makeAssertionsLoad($definitions); } @@ -36,7 +36,7 @@ public function testReadString() public function testReadNode() { $dom = new \DOMDocument(); - $dom->load(__DIR__.'/resources/base-wsdl.wsdl'); + $dom->load(__DIR__ . '/resources/base-wsdl.wsdl'); $definitions = $this->reader->readNode($dom->documentElement); $this->assertInstanceOf('GoetasWebservices\XML\WSDLReader\Wsdl\Definitions', $definitions); @@ -45,7 +45,7 @@ public function testReadNode() public function testImport() { - $definitions = $this->reader->readFile(__DIR__.'/resources/base-wsdl-import.wsdl'); + $definitions = $this->reader->readFile(__DIR__ . '/resources/base-wsdl-import.wsdl'); $this->assertInstanceOf('GoetasWebservices\XML\WSDLReader\Wsdl\Definitions', $definitions); $this->assertEquals("bar", $definitions->getName()); @@ -65,7 +65,7 @@ public function testImport() */ public function testTypeNotFound() { - $definitions = $this->reader->readFile(__DIR__.'/resources/base-wsdl-import.wsdl'); + $definitions = $this->reader->readFile(__DIR__ . '/resources/base-wsdl-import.wsdl'); $this->assertNotNull($definitions->findBinding('StockQuoteSoap2', 'http://www.example.com')); } diff --git a/tests/EventsTest.php b/tests/EventsTest.php index 6c3b6a9..7468c82 100644 --- a/tests/EventsTest.php +++ b/tests/EventsTest.php @@ -2,7 +2,6 @@ namespace GoetasWebservices\XML\WSDLReader\Tests; use GoetasWebservices\XML\WSDLReader\DefinitionsReader; -use GoetasWebservices\XML\WSDLReader\Wsdl\Definitions; use Jmikola\WildcardEventDispatcher\WildcardEventDispatcher; use Symfony\Component\EventDispatcher\Event; @@ -30,44 +29,44 @@ public function setUp() public function testReadFile() { $events = array(); - $this->dispatcher->addListener("#", function(Event $e) use (&$events){ + $this->dispatcher->addListener("#", function (Event $e) use (&$events) { $events[] = $e; }); - $this->reader->readFile(__DIR__.'/resources/base-wsdl-events.wsdl'); + $this->reader->readFile(__DIR__ . '/resources/base-wsdl-events.wsdl'); $expected = []; - $expected[] = ['definitions_start', 'GoetasWebservices\XML\WSDLReader\Events\DefinitionsEvent']; + $expected[] = ['definitions_start', 'GoetasWebservices\XML\WSDLReader\Events\DefinitionsEvent']; - $expected[] = ['service', 'GoetasWebservices\XML\WSDLReader\Events\ServiceEvent']; - $expected[] = ['service.port', 'GoetasWebservices\XML\WSDLReader\Events\Service\PortEvent']; + $expected[] = ['service', 'GoetasWebservices\XML\WSDLReader\Events\ServiceEvent']; + $expected[] = ['service.port', 'GoetasWebservices\XML\WSDLReader\Events\Service\PortEvent']; - $expected[] = ['message', 'GoetasWebservices\XML\WSDLReader\Events\MessageEvent']; - $expected[] = ['message.part', 'GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent']; - $expected[] = ['message', 'GoetasWebservices\XML\WSDLReader\Events\MessageEvent']; - $expected[] = ['message.part', 'GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent']; + $expected[] = ['message', 'GoetasWebservices\XML\WSDLReader\Events\MessageEvent']; + $expected[] = ['message.part', 'GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent']; + $expected[] = ['message', 'GoetasWebservices\XML\WSDLReader\Events\MessageEvent']; + $expected[] = ['message.part', 'GoetasWebservices\XML\WSDLReader\Events\Message\PartEvent']; - $expected[] = ['portType', 'GoetasWebservices\XML\WSDLReader\Events\PortTypeEvent']; - $expected[] = ['portType.operation', 'GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent']; - $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; - $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; + $expected[] = ['portType', 'GoetasWebservices\XML\WSDLReader\Events\PortTypeEvent']; + $expected[] = ['portType.operation', 'GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent']; + $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; + $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; - $expected[] = ['portType.operation', 'GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent']; - $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; - $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; - $expected[] = ['portType.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\PortType\FaultEvent']; + $expected[] = ['portType.operation', 'GoetasWebservices\XML\WSDLReader\Events\PortType\OperationEvent']; + $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; + $expected[] = ['portType.operation.param', 'GoetasWebservices\XML\WSDLReader\Events\PortType\ParamEvent']; + $expected[] = ['portType.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\PortType\FaultEvent']; - $expected[] = ['binding', 'GoetasWebservices\XML\WSDLReader\Events\BindingEvent']; + $expected[] = ['binding', 'GoetasWebservices\XML\WSDLReader\Events\BindingEvent']; - $expected[] = ['binding.operation', 'GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent']; + $expected[] = ['binding.operation', 'GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent']; $expected[] = ['binding.operation.message', 'GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent']; $expected[] = ['binding.operation.message', 'GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent']; - $expected[] = ['binding.operation', 'GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent']; + $expected[] = ['binding.operation', 'GoetasWebservices\XML\WSDLReader\Events\Binding\OperationEvent']; $expected[] = ['binding.operation.message', 'GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent']; $expected[] = ['binding.operation.message', 'GoetasWebservices\XML\WSDLReader\Events\Binding\MessageEvent']; - $expected[] = ['binding.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent']; - $expected[] = ['binding.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent']; + $expected[] = ['binding.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent']; + $expected[] = ['binding.operation.fault', 'GoetasWebservices\XML\WSDLReader\Events\Binding\FaultEvent']; $expected[] = ['definitions_end', 'GoetasWebservices\XML\WSDLReader\Events\DefinitionsEvent'];