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

Commit

Permalink
Merge branch 'hotfix/3342' into develop
Browse files Browse the repository at this point in the history
Forward port zendframework/zendframework#3342

Conflicts:
	library/Zend/File/Transfer/Adapter/AbstractAdapter.php
	library/Zend/File/Transfer/Adapter/Http.php
	library/Zend/File/Transfer/Transfer.php
	library/Zend/Http/Cookies.php
	library/Zend/Soap/Client.php
	library/Zend/Soap/Wsdl.php
	library/Zend/Stdlib/ErrorHandler.php
	library/Zend/Stdlib/Hydrator/ClassMethods.php
	library/Zend/Validator/File/Count.php
	library/Zend/Validator/File/Crc32.php
	library/Zend/Validator/File/ExcludeExtension.php
	library/Zend/Validator/File/ExcludeMimeType.php
	library/Zend/Validator/File/Exists.php
	library/Zend/Validator/File/Extension.php
	library/Zend/Validator/File/FilesSize.php
	library/Zend/Validator/File/Hash.php
	library/Zend/Validator/File/ImageSize.php
	library/Zend/Validator/File/Md5.php
	library/Zend/Validator/File/MimeType.php
	library/Zend/Validator/File/NotExists.php
	library/Zend/Validator/File/Sha1.php
	library/Zend/Validator/File/Size.php
	library/Zend/Validator/File/Upload.php
	library/Zend/Validator/File/WordCount.php
	tests/ZendTest/Validator/File/FilesSizeTest.php
  • Loading branch information
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/Fault.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public function getEncoding()
* Load an XMLRPC fault from XML
*
* @param string $fault
* @return boolean Returns true if successfully loaded fault response, false
* @return bool Returns true if successfully loaded fault response, false
* if response was not a fault response
* @throws Exception\ExceptionInterface if no or faulty XML provided, or if fault
* response does not contain either code or message
Expand Down Expand Up @@ -250,7 +250,7 @@ public function loadXml($fault)
* Determine if an XML response is an XMLRPC fault
*
* @param string $xml
* @return boolean
* @return bool
*/
public static function isFault($xml)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function getEncoding()
* Set method to call
*
* @param string $method
* @return boolean Returns true on success, false if method name is invalid
* @return bool Returns true on success, false if method name is invalid
*/
public function setMethod($method)
{
Expand Down Expand Up @@ -277,7 +277,7 @@ public function getTypes()
*
* @param string $request
* @throws Exception\ValueException if invalid XML
* @return boolean True on success, false if an error occurred.
* @return bool True on success, false if an error occurred.
*/
public function loadXml($request)
{
Expand Down Expand Up @@ -366,7 +366,7 @@ public function loadXml($request)
* Does the current request contain errors and should it return a fault
* response?
*
* @return boolean
* @return bool
*/
public function isFault()
{
Expand Down
4 changes: 2 additions & 2 deletions src/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected function _getXmlRpcReturn()
/**
* Is the response a fault response?
*
* @return boolean
* @return bool
*/
public function isFault()
{
Expand All @@ -144,7 +144,7 @@ public function getFault()
*
* @param string $response
* @throws Exception\ValueException if invalid XML
* @return boolean True if a valid XMLRPC response, false if a fault
* @return bool True if a valid XMLRPC response, false if a fault
* response or invalid input
*/
public function loadXml($response)
Expand Down
8 changes: 4 additions & 4 deletions src/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Server extends AbstractServer
/**
* Flag: whether or not {@link handle()} should return a response instead
* of automatically emitting it.
* @var boolean
* @var bool
*/
protected $returnResponse = false;

Expand Down Expand Up @@ -259,7 +259,7 @@ public function fault($fault = null, $code = 404)
*
* The response is always available via {@link getResponse()}.
*
* @param boolean $flag
* @param bool $flag
* @return Server
*/
public function setReturnResponse($flag = true)
Expand All @@ -271,7 +271,7 @@ public function setReturnResponse($flag = true)
/**
* Retrieve return response flag
*
* @return boolean
* @return bool
*/
public function getReturnResponse()
{
Expand Down Expand Up @@ -435,7 +435,7 @@ public function getResponse()
*
* @param string $class
* @throws Server\Exception\InvalidArgumentException if invalid response class
* @return boolean True if class was set, false if not
* @return bool True if class was set, false if not
*/
public function setResponseClass($class)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Server/Fault.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public static function detachFaultException($classes)
* 'observe' that accepts an exception as its sole argument.
*
* @param string $class
* @return boolean
* @return bool
*/
public static function attachObserver($class)
{
Expand All @@ -157,7 +157,7 @@ public static function attachObserver($class)
* Detach an observer
*
* @param string $class
* @return boolean
* @return bool
*/
public static function detachObserver($class)
{
Expand Down

0 comments on commit d702695

Please sign in to comment.