mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/17357] Remove file_info from storage

Browse Source 
PHPBB-17357
This commit is contained in:
Ruben Calvo
2024-06-30 13:59:41 +02:00
parent 1dacbf6bde
commit 877e364cbd
16 changed files with 118 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/phpbb/storage/controller/controller.php
View File

@@ -16,6 +16,7 @@ namespace phpbb\storage\controller;
use phpbb\cache\service;
use phpbb\db\driver\driver_interface;
use phpbb\exception\http_exception;
use phpbb\mimetype\extension_guesser;
use phpbb\storage\exception\storage_exception;
use phpbb\storage\storage;
use Symfony\Component\HttpFoundation\Request as symfony_request;
@@ -33,6 +34,9 @@ class controller
/** @var driver_interface */
protected $db;
/** @var extension_guesser */
protected $extension_guesser;
/** @var storage */
protected $storage;
@@ -47,10 +51,11 @@ class controller
* @param storage $storage
* @param symfony_request $symfony_request
*/
public function __construct(service $cache, driver_interface $db, storage $storage, symfony_request $symfony_request)
public function __construct(service $cache, driver_interface $db, extension_guesser $extension_guesser, storage $storage, symfony_request $symfony_request)
{
$this->cache = $cache;
$this->db = $db;
$this->extension_guesser = $extension_guesser;
$this->storage = $storage;
$this->symfony_request = $symfony_request;
}
@@ -124,14 +129,12 @@ class controller
*/
protected function prepare(StreamedResponse $response, string $file): void
{
$file_info = $this->storage->file_info($file);
// Add Content-Type header
if (!$response->headers->has('Content-Type'))
{
try
{
$content_type = $file_info->get('mimetype');
$content_type = $this->extension_guesser->guess($file);
}
catch (storage_exception $e)
{
@@ -146,7 +149,7 @@ class controller
{
try
{
$response->headers->set('Content-Length', $file_info->get('size'));
$response->headers->set('Content-Length', $this->storage->file_size($file));
}
catch (storage_exception $e)
{