8000 Improve error messages for failed connections by clue · Pull Request #270 · reactphp/socket · GitHub
[go: up one dir, main page]
Skip to content
8000

Improve error messages for failed connections #270

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 6 commits into from
Sep 3, 2021
Merged

Improve error messages for failed connections #270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d471da
Improve examples to use proper error handlers
clue Aug 29, 2021
2c16a9c
Refactor to reuse URI construction
clue Aug 29, 2021
4e70843
Omit internal hostname argument from error messages
clue Sep 1, 2021
d77d54a
Prepend tcp:// scheme for URIs in error messages when missing
clue Sep 1, 2021
f561c4e
Use tls:// scheme for URIs in error messages for secure connections
clue Sep 2, 2021
115097f
Avoid garbage memory references on PHP < 7.4
clue Sep 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Lo 8000 ading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Avoid garbage memory references on PHP < 7.4
  • Loading branch information
@clue
clue committed Sep 3, 2021
commit 115097f9ce959852f8e1556fd055136aaa74b5cc
20 changes: 20 additions & 0 deletions src/DnsConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,26 @@ function ($resolve, $reject) use (&$promise, &$resolved, $uri, $connector, $host
$e->getCode(),
$e
);

// avoid garbage references by replacing all closures in call stack.
// what a lovely piece of code!
$r = new \ReflectionProperty('Exception', 'trace');
$r->setAccessible(true);
$trace = $r->getValue($e);

// Exception trace arguments are not available on some PHP 7.4 installs
// @codeCoverageIgnoreStart
foreach ($trace as &$one) {
if (isset($one['args'])) {
foreach ($one['args'] as &$arg) {
if ($arg instanceof \Closure) {
$arg = 'Object(' . \get_class($arg) . ')';
}
}
}
}
// @codeCoverageIgnoreEnd
$r->setValue($e, $trace);
}

throw $e;
Expand Down
20 changes: 20 additions & 0 deletions src/SecureConnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,26 @@ public function connect($uri)
$e->getCode(),
$e
);

// avoid garbage references by replacing all closures in call stack.
// what a lovely piece of code!
$r = new \ReflectionProperty('Exception', 'trace');
$r->setAccessible(true);
$trace = $r->getValue($e);

// Exception trace arguments are not available on some PHP 7.4 installs
// @codeCoverageIgnoreStart
foreach ($trace as &$one) {
if (isset($one['args'])) {
foreach ($one['args'] as &$arg) {
if ($arg instanceof \Closure) {
$arg = 'Object(' . \get_class($arg) . ')';
}
}
}
}
// @codeCoverageIgnoreEnd
$r->setValue($e, $trace);
}

throw $e;
Expand Down
0