Skip to content

Reset should not trigger setDefaultException error #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2020
Merged

Reset should not trigger setDefaultException error #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eab9fec
Merge remote-tracking branch 'upstream/master'
KDederichs Feb 26, 2020
5868be6
Don't trigger when default exception is null
KDederichs Feb 26, 2020
760af6f
style CI fix
KDederichs Feb 26, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 1.4.0 -

### Fixed
- `reset()` should not trigger `setDefaultException` error condition

### Breaking
- drop support for PHP 5 and 7.0

## 1.3.1 - 2019-11-06
Expand Down
2 changes: 1 addition & 1 deletion src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public function addException(\Exception $exception)
*/
public function setDefaultException(\Exception $defaultException = null)
{
if (!$defaultException instanceof Exception) {
if (null !== $defaultException && !$defaultException instanceof Exception) {
@trigger_error('Clients may only throw exceptions of type '.Exception::class.'. Setting an exception of class '.get_class($defaultException).' will not be possible anymore in the future', E_USER_DEPRECATED);
}
$this->defaultException = $defaultException;
Expand Down