Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…
Browse files Browse the repository at this point in the history
…ix/uri-path-not-being-set-when-empty
  • Loading branch information
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Client/DotNet.php
Expand Up @@ -19,7 +19,7 @@
* Class is intended to be used with .Net Web Services.
*
* Important! Class is at experimental stage now.
* Please leave your notes, compatiblity issues reports or
* Please leave your notes, compatibility issues reports or
* suggestions in fw-webservices@lists.zend.com or fw-general@lists.com
*
* @category Zend
Expand Down
6 changes: 3 additions & 3 deletions src/Server.php
Expand Up @@ -723,7 +723,7 @@ public function getResponse()
*
* Uses {@link $wsdl} and return value of {@link getOptions()} to instantiate
* SoapServer object, and then registers any functions or class with it, as
* well as peristence.
* well as persistence.
*
* @return SoapServer
*/
Expand Down Expand Up @@ -767,7 +767,7 @@ protected function _getSoap()
* - string; if so, verifies XML
*
* If no request is passed, pulls request using php:://input (for
* cross-platform compatability purposes).
* cross-platform compatibility purposes).
*
* @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request Optional request
* @return void|string
Expand Down Expand Up @@ -817,7 +817,7 @@ public function handle($request = null)
}

/**
* Method initalizes the error context that the SOAPServer enviroment will run in.
* Method initializes the error context that the SOAPServer environment will run in.
*
* @return boolean display_errors original value
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Server/DocumentLiteralWrapper.php
Expand Up @@ -132,7 +132,7 @@ protected function _parseArguments($method, $document)
foreach (get_object_vars($document) as $argName => $argValue) {
if (!isset($params[$argName])) {
throw new UnexpectedValueException(sprintf(
"Recieved unknown argument %s which is not an argument to %s::%s",
"Received unknown argument %s which is not an argument to %s::%s",
get_class($this->object), $method
));
}
Expand Down
2 changes: 1 addition & 1 deletion src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php
Expand Up @@ -70,7 +70,7 @@ protected function _getTypeBasedOnNestingLevel($singularType, $level)
}

/**
* From a nested defintion with type[], get the singular xsd:type
* From a nested definition with type[], get the singular xsd:type
*
* @param string $type
* @return string
Expand Down

0 comments on commit 8cc5c74

Please sign in to comment.