mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 17:56:52 +02:00
[ticket/16649] Upgrade to Symfony 5
PHPBB3-16649
This commit is contained in:
@@ -32,14 +32,14 @@ class guesser_test extends \phpbb_test_case
|
||||
global $phpbb_root_path;
|
||||
|
||||
$guessers = array(
|
||||
new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser(),
|
||||
new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser(),
|
||||
new \Symfony\Component\Mime\FileinfoMimeTypeGuesser(),
|
||||
new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser(),
|
||||
new \phpbb\mimetype\extension_guesser,
|
||||
new \phpbb\mimetype\content_guesser,
|
||||
);
|
||||
|
||||
// Check if any guesser except the extension_guesser is available
|
||||
$this->fileinfo_supported = $guessers[0]->isSupported() | $guessers[1]->isSupported() | $guessers[3]->is_supported();
|
||||
$this->fileinfo_supported = $guessers[0]->isGuesserSupported() | $guessers[1]->isGuesserSupported() | $guessers[3]->is_supported();
|
||||
|
||||
// Also create a guesser that emulates not having fileinfo available
|
||||
$this->guesser_no_fileinfo = new \phpbb\mimetype\guesser(array($guessers[2]));
|
||||
@@ -175,7 +175,11 @@ class guesser_test extends \phpbb_test_case
|
||||
// Cover possible LogicExceptions
|
||||
foreach ($guessers as $cur_guesser)
|
||||
{
|
||||
$supported += $cur_guesser->is_supported();
|
||||
$is_supported = (method_exists($cur_guesser, 'is_supported')) ? 'is_supported' : '';
|
||||
$is_supported = (method_exists($cur_guesser, 'isSupported')) ? 'isSupported' : $is_supported;
|
||||
$is_supported = (method_exists($cur_guesser, 'isGuesserSupported')) ? 'isGuesserSupported' : $is_supported;
|
||||
|
||||
$supported += $cur_guesser->$is_supported();
|
||||
}
|
||||
|
||||
if (!$supported)
|
||||
@@ -194,9 +198,9 @@ class guesser_test extends \phpbb_test_case
|
||||
public function test_sort_priority()
|
||||
{
|
||||
$guessers = array(
|
||||
'FileinfoMimeTypeGuesser' => new \Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser,
|
||||
'FileinfoMimeTypeGuesser' => new \Symfony\Component\Mime\FileinfoMimeTypeGuesser,
|
||||
'extension_guesser' => new \phpbb\mimetype\extension_guesser,
|
||||
'FileBinaryMimeTypeGuesser' => new \Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser,
|
||||
'FileBinaryMimeTypeGuesser' => new \Symfony\Component\Mime\FileBinaryMimeTypeGuesser,
|
||||
'content_guesser' => new \phpbb\mimetype\content_guesser,
|
||||
);
|
||||
$guessers['content_guesser']->set_priority(5);
|
||||
|
Reference in New Issue
Block a user