Skip to content

Commit

Permalink
Fix deprecation complaints from phan
Browse files Browse the repository at this point in the history
  • Loading branch information
driusan committed Dec 13, 2022
1 parent ad623ec commit 97e014e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ class Raw extends Endpoint implements \LORIS\Middleware\ETagCalculator

$callback = function () use ($mincpath, $fullpath) {
return shell_exec(
"${mincpath}/bin/minctoraw -byte -unsigned -normalize $fullpath"
"{$mincpath}/bin/minctoraw -byte -unsigned -normalize $fullpath"
);
};

return (new \LORIS\Http\Response())
->withHeader('Content-Type', 'application/x.raw')
->withHeader('Content-Disposition', "attachment; filename=${filename}")
->withHeader('Content-Disposition', "attachment; filename={$filename}")
->withBody(new \Laminas\Diactoros\CallbackStream($callback));
}

Expand Down
4 changes: 2 additions & 2 deletions php/installer/Database.class.inc
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class Database
if ($table == '*') {
$table = '\*';
}
$pattern = "/GRANT .*(ALL|${privilege}).* ON" .
" `?([*]|${database})`?[.]`?([*]|${table})`?/";
$pattern = "/GRANT .*(ALL|{$privilege}).* ON" .
" `?([*]|{$database})`?[.]`?([*]|{$table})`?/";

// Test all privileges return from SHOW GRANTS against the pattern
return array_reduce(
Expand Down

0 comments on commit 97e014e

Please # to comment.