mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/15392' into ticket/15392-master

Browse Source
This commit is contained in:
Marc Alexander
2021-03-04 17:04:17 +01:00
parent 1306e63fd7 7a310cc7d9
commit b46e242013
211 changed files with 395 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/mimetype/guesser_test.php
View File

@@ -13,8 +13,8 @@
namespace phpbb\mimetype;
require_once dirname(__FILE__) . '/null_guesser.php';
require_once dirname(__FILE__) . '/incorrect_guesser.php';
require_once __DIR__ . '/null_guesser.php';
require_once __DIR__ . '/incorrect_guesser.php';
function function_exists($name)
{
@@ -45,7 +45,7 @@ class guesser_test extends \phpbb_test_case
$this->guesser_no_fileinfo = new \phpbb\mimetype\guesser(array($guessers[2]));
$this->guesser = new \phpbb\mimetype\guesser($guessers);
$this->path = dirname(__FILE__);
$this->path = __DIR__;
$this->jpg_file = $this->path . '/fixtures/jpg';
$this->phpbb_root_path = $phpbb_root_path;
}