Skip to content

Fix HtmlRenderer to handle FriendlyException attribute safely #147

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

Open
shuangjie wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix HtmlRenderer to handle FriendlyException attribute safely #147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c08cf44
Fix HtmlRenderer to handle FriendlyException attribute safely when cl…
shuangjie Apr 17, 2025
40f70ae
Apply Rector changes (CI)
shuangjie Apr 17, 2025
9b259e2
Use class name notation instead of strings for FriendlyException attr…
shuangjie Apr 20, 2025
c67a10b
Merge remote changes
shuangjie Apr 20, 2025
2f7bad2
Merge branch 'master' into feature/php8-attributes
shuangjie Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use class name notation instead of strings for FriendlyException attr… 
…ibute

- Remove unnecessary try/catch blocks as suggested in PR review
  • Loading branch information
@shuangjie
shuangjie committed Apr 20, 2025
commit 9b259e2e11f79a7cb9c499916f759757172417d7
18 changes: 7 additions & 11 deletions src/Renderer/HtmlRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,18 +507,14 @@ public function getThrowableName(Throwable $throwable): string
$name = $throwable->getName() . ' (' . $name . ')';
} else {
// Check if the exception class has FriendlyException attribute
try {
$reflectionClass = new ReflectionClass($throwable);
if (class_exists('Yiisoft\FriendlyException\Attribute\FriendlyException')) {
$attributes = $reflectionClass->getAttributes('Yiisoft\FriendlyException\Attribute\FriendlyException');

if (!empty($attributes)) {
$friendlyExceptionAttribute = $attributes[0]->newInstance();
$name = $friendlyExceptionAttribute->name . ' (' . $name . ')';
}
$reflectionClass = new ReflectionClass($throwable);
if (class_exists(\Yiisoft\FriendlyException\Attribute\FriendlyException::class)) {
$attributes = $reflectionClass->getAttributes(\Yiisoft\FriendlyException\Attribute\FriendlyException::class);

if (!empty($attributes)) {
$friendlyExceptionAttribute = $attributes[0]->newInstance();
$name = $friendlyExceptionAttribute->name . ' (' . $name . ')';
}
} catch (\Throwable $e) {
// Ignore exception and keep default name
}
}

Expand Down
8 changes: 4 additions & 4 deletions templates/development.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
$solution = $isFriendlyException ? $throwable->getSolution() : null;

// Check if the exception class has FriendlyException attribute
if ($solution === null && class_exists('Yiisoft\FriendlyException\Attribute\FriendlyException')) {
if ($solution === null && class_exists(\Yiisoft\FriendlyException\Attribute\FriendlyException::class)) {
try {
$reflectionClass = new ReflectionClass($throwable);
$attributes = $reflectionClass->getAttributes('Yiisoft\FriendlyException\Attribute\FriendlyException');
$attributes = $reflectionClass->getAttributes(\Yiisoft\FriendlyException\Attribute\FriendlyException::class);

if (!empty($attributes)) {
$friendlyExceptionAttribute = $attributes[0]->newInstance();
Expand Down Expand Up @@ -111,10 +111,10 @@
// Check if the exception class has FriendlyException attribute
$hasFriendlyNameFromAttribute = false;

if (class_exists('Yiisoft\FriendlyException\Attribute\FriendlyException')) {
if (class_exists(\Yiisoft\FriendlyException\Attribute\FriendlyException::class)) {
try {
$reflectionClass = new ReflectionClass($throwable);
$attributes = $reflectionClass->getAttributes('Yiisoft\FriendlyException\Attribute\FriendlyException');
$attributes = $reflectionClass->getAttributes(\Yiisoft\FriendlyException\Attribute\FriendlyException::class);

if (!empty($attributes)) {
$friendlyExceptionAttribute = $attributes[0]->newInstance();
Expand Down