diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-10-03 12:15:48 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-10-03 12:15:48 +0100 |
| commit | 6b9cb339562c8aa4681c7eff2bf3bdf401cc9edd (patch) | |
| tree | 1f7bfd68d1cf96ea4ba9d8094ab931d9a0a405e8 /app/Http/RequestHandlers/MediaFileDownload.php | |
| parent | da616f3de48e91ba07cf8efe6aa888392c873a0c (diff) | |
| download | webtrees-6b9cb339562c8aa4681c7eff2bf3bdf401cc9edd.tar.gz webtrees-6b9cb339562c8aa4681c7eff2bf3bdf401cc9edd.tar.bz2 webtrees-6b9cb339562c8aa4681c7eff2bf3bdf401cc9edd.zip | |
#3529 - rename Factory to Registry
Diffstat (limited to 'app/Http/RequestHandlers/MediaFileDownload.php')
| -rw-r--r-- | app/Http/RequestHandlers/MediaFileDownload.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/Http/RequestHandlers/MediaFileDownload.php b/app/Http/RequestHandlers/MediaFileDownload.php index 2b7d427872..a8fba14c63 100644 --- a/app/Http/RequestHandlers/MediaFileDownload.php +++ b/app/Http/RequestHandlers/MediaFileDownload.php @@ -22,18 +22,14 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fig\Http\Message\StatusCodeInterface; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\Contracts\UserInterface; -use Fisharebest\Webtrees\Exceptions\HttpNotFoundException; -use Fisharebest\Webtrees\Factory; +use Fisharebest\Webtrees\Registry; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; -use function addcslashes; use function assert; use function redirect; -use function response; -use function strlen; /** * Download a media file. @@ -55,7 +51,7 @@ class MediaFileDownload implements RequestHandlerInterface $user = $request->getAttribute('user'); assert($user instanceof UserInterface); - $image_factory = Factory::image(); + $image_factory = Registry::imageFactory(); $disposition = $request->getQueryParams()['disposition'] ?? 'inline'; assert($disposition === 'inline' || $disposition === 'attachment'); @@ -63,7 +59,7 @@ class MediaFileDownload implements RequestHandlerInterface $params = $request->getQueryParams(); $xref = $params['xref']; $fact_id = $params['fact_id']; - $media = Factory::media()->make($xref, $tree); + $media = Registry::mediaFactory()->make($xref, $tree); $media = Auth::checkMediaAccess($media); foreach ($media->mediaFiles() as $media_file) { |
