Skip to content

fix(presentations): catch Throwable in PresentationMaterial::getSummitId #603

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
smarcet merged 2 commits into from
Sep 16, 2026
+15 −2
Merged

fix(presentations): catch Throwable in PresentationMaterial::getSummitId #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
249aef0
fix(presentations): catch Throwable in PresentationMaterial::getSummitId
smarcet Sep 16, 2026
6962b0b
fix(presentations): catch Throwable in PresentationMaterial::getPrese…
smarcet Sep 16, 2026
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
4 changes: 2 additions & 2 deletions app/Models/Foundation/Summit/Events/Presentations/Materials/PresentationMaterial.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function getPresentationId(){
try {
return $this->presentation->getId();
}
catch (\Exception $ex){
catch (\Throwable $ex){
return 0;
}
}
Expand All @@ -81,7 +81,7 @@ public function getSummitId(): int
try {
return $this->presentation->getSummitId();
}
catch (\Exception $ex){
catch (\Throwable $ex){
return 0;
}
}
Expand Down
13 changes: 13 additions & 0 deletions tests/Unit/Services/PresentationMaterialEventDispatchTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,17 @@ public function testDeleteMediaUploadDispatchesLifeCycleEventWithoutError(): voi
$this->assertCount(1, $jobs, 'Expected 1 ProcessScheduleEntityLifeCycleEvent for PresentationMediaUpload delete');
$this->assertSame(0, $jobs[0]->summit_id, 'summit_id is 0 here because unsetPresentation() runs before PreRemove - accepted degraded case, not a regression');
}

/**
* Both accessors must survive a material whose owning presentation is not set - the
* state removeMediaUpload() leaves behind before PreRemove fires. A null dereference
* throws \Error, which a catch of \Exception does not cover.
*/
public function testAccessorsReturnZeroWhenPresentationIsNotSet(): void
{
$media_upload = new PresentationMediaUpload();

$this->assertSame(0, $media_upload->getPresentationId());
$this->assertSame(0, $media_upload->getSummitId());
}
}
Loading