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

Commit

Permalink
Merge branch 'feature/5792' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Mar 4, 2014
190 parents f6d1719 + 55212c1 + 38be842 + 4ebc653 + 52f7747 + 57b39fa + b06e239 + 156b2cc + 991d497 + 5abe4b0 + d089acd + 6fcf214 + bcbd2dd + 91375d9 + da20dbf + 8cb31b9 + 34aaa76 + a941379 + 5ec4274 + 1a8b800 + 045212a + c918e2c + 1d51877 + 073ffb1 + 6cc70c4 + cca448e + 5f78560 + 1c0be41 + 02f7335 + 88a04db + b1c3dd1 + f3d5365 + 88de986 + fb38487 + 7bfe758 + 2e55342 + 6a04f31 + 57ecc1a + b78abaa + 30a9569 + f96aa9d + 23f86e7 + d43d656 + 4de219f + 3c20bba + a0d3747 + 456d331 + e503406 + 95c2a28 + 1fc5b65 + bc3880f + 2989a80 + e8f73d2 + fcc59de + ad50dbb + a46cbd4 + 6192f93 + bb42677 + 02419fd + cf6df36 + 92345be + 737b39e + fde18af + 43ca092 + e3acc17 + b5bc61a + 30d69f9 + 7dbd12c + 9f45cc7 + 473bfa3 + 916cd80 + 5aac7b0 + 6f66646 + 12c90a3 + 435c161 + 9bb6b33 + 6c32cce + f3c637f + c54876c + e1d13eb + daa8e6c + 5570955 + 388a6c0 + ac33840 + 00e233b + 532572e + 1e1f8d2 + b636e56 + 18878ed + 79ce391 + 9db7d70 + 0c2ce53 + 8dbc4b8 + b8b5d22 + 3dac49c + c87ef97 + 1ffe869 + fbe0570 + 802848d + 9fd0967 + 537b471 + 8cc3c9d + 7f51755 + 71ea52c + f2338ea + 226aada + 6f2818d + fafc8ae + 06d397d + 42a5665 + 9b6e2d1 + 96a0498 + 8cc5c74 + e3d1211 + ec85470 + a6f2c9c + fd7b83c + 6d8b4af + b29c8c0 + 64f42ce + 1a82cad + becf6c6 + 2ef3150 + 298e4df + 829ed04 + 4f30658 + ca02442 + 93fe9e8 + 28004c9 + ee4145b + 5e1f577 + 783b983 + 7b0d8d0 + 93db32e + 2b88f8e + fddfc5a + 7bc42fb + 0fe8dfb + 5ee657c + 5f406b6 + c948fa3 + 960d3da + c281e33 + 62224a4 + 6f2357e + 20aefa2 + 31e6b5a + 8a77c3a + 4982e89 + 1386ed7 + 67368ff + 95214da + 6434c7e + 659bce0 + e6b0ec4 + 5fcb527 + 19f72a6 + 8993ba7 + b8734d1 + e0c31db + 3a7c753 + f31a6f9 + 1a8bac6 + 2c9c99a + c36df00 + 996a250 + 13b7c35 + 6901b30 + f0c8580 + 92424ea + 2340663 + 463b567 + 4e6645a + 6b6cbe1 + 43892df + 2090a9b + 00f4352 + b6d661c + 8b90718 + 9c6a483 + 6714a1c + a942f30 + d9d836f + 5c18787 + b9cf3cc + d64ca84 + 5d21113 + 665e171 + c49a0cf + 4d119ad commit 81bebe2
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ class Server implements ZendServerServer
*/
protected $object;

/**
* Informs if the soap server is in debug mode
* @var bool
*/
protected $debug = false;

/**
* Persistence mode; should be one of the SOAP persistence constants
* @var int
Expand Down Expand Up @@ -925,6 +931,17 @@ protected function _initializeSoapErrorContext()
return $displayErrorsOriginalState;
}

/**
* Set the debug mode.
* In debug mode, all exceptions are send to the client.
* @param bool $debug
*/
public function setDebugMode($debug)
{
$this->debug = $debug;
return $this;
}

/**
* Validate and register fault exception
*
Expand Down Expand Up @@ -961,6 +978,10 @@ public function registerFaultException($class)
*/
public function isRegisteredAsFaultException($fault)
{
if ($this->debug) {
return true;
}

$ref = new ReflectionClass($fault);
$classNames = $ref->getName();
return in_array($classNames, $this->faultExceptions);
Expand Down
11 changes: 11 additions & 0 deletions test/ServerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -937,4 +937,15 @@ public function testShouldThrowExceptionIfHandledRequestContainsDoctype()
$this->assertContains('Invalid XML', $response->getMessage());
}

public function testDebugMode()
{
$server = new Server();
$beforeDebug = $server->fault(new \Exception('test'));
$server->setDebugMode(true);
$afterDebug = $server->fault(new \Exception('test'));

$this->assertEquals('Unknown error', $beforeDebug->getMessage());
$this->assertEquals('test', $afterDebug->getMessage());
}

}

0 comments on commit 81bebe2

Please # to comment.