mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +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

18
tests/lint_test.php
View File

@@ -54,7 +54,7 @@ class lint_test extends phpbb_test_case
public function lint_data()
{
return $this->check(dirname(__FILE__) . '/..');
return $this->check(__DIR__ . '/..');
}
protected function check($root)
@@ -80,16 +80,16 @@ class lint_test extends phpbb_test_case
continue;
}
if (is_dir($path) && !in_array($path, array(
dirname(__FILE__) . '/../.git',
dirname(__FILE__) . '/../build/new_version',
dirname(__FILE__) . '/../build/old_versions',
dirname(__FILE__) . '/../phpBB/cache',
dirname(__FILE__) . '/../phpBB/ext',
dirname(__FILE__) . '/../phpBB/store',
__DIR__ . '/../.git',
__DIR__ . '/../build/new_version',
__DIR__ . '/../build/old_versions',
__DIR__ . '/../phpBB/cache',
__DIR__ . '/../phpBB/ext',
__DIR__ . '/../phpBB/store',
// PHP Fatal error: Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20
// https://gist.github.com/e003913ffd493da63cbc
dirname(__FILE__) . '/../phpBB/vendor',
dirname(__FILE__) . '/../node_modules',
__DIR__ . '/../phpBB/vendor',
__DIR__ . '/../node_modules',
)))
{
$files = array_merge($files, $this->check($path));