Skip to content

Use Throwable as type hint in the exception callback #35713

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
DeepDiver1975 merged 1 commit into from
Jul 3, 2019
Merged

Use Throwable as type hint in the exception callback #35713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 apps/dav/lib/Connector/Sabre/FilesPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ public function checkMove($source, $destination) {
/**
* This sets a cookie to be able to recognize the failure of the download
*
* @param \Exception $ex
* @param \Throwable $ex
*/
public function handleDownloadFailure(\Exception $ex) {
public function handleDownloadFailure(\Throwable $ex) {
$queryParams = $this->server->httpRequest->getQueryParameters();

if (isset($queryParams['downloadStartSecret'])) {
Expand Down
8 changes: 4 additions & 4 deletions apps/dav/lib/Files/BrowserErrorPagePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ public static function isBrowserRequest(IRequest $request) {
}

/**
* @param \Exception $ex
* @param \Throwable $ex
*/
public function logException(\Exception $ex) {
public function logException(\Throwable $ex) {
if ($ex instanceof Exception) {
$httpCode = $ex->getHTTPCode();
$headers = $ex->getHTTPHeaders($this->server);
Expand All @@ -88,10 +88,10 @@ public function logException(\Exception $ex) {

/**
* @codeCoverageIgnore
* @param \Exception $ex
* @param \Throwable $ex
* @return bool|string
*/
public function generateBody(\Exception $ex) {
public function generateBody(\Throwable $ex) {
$request = \OC::$server->getRequest();
$content = new OC_Template('dav', 'exception', 'guest');
$content->assign('title', $this->server->httpResponse->getStatusText());
Expand Down