makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse source 
* 3.0.x:
  [ticket/13875] Ignore cache, ext, and store folder in lint test

Conflicts:
	tests/lint_test.php
This commit is contained in:
Andreas Fischer 2015-05-29 22:46:28 +02:00
commit b5fed65fe3
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/lint_test.php
View file

@ -84,6 +84,8 @@ class phpbb_lint_test extends phpbb_test_case
dirname(__FILE__) . '/../build/new_version', dirname(__FILE__) . '/../build/new_version',
dirname(__FILE__) . '/../build/old_versions', dirname(__FILE__) . '/../build/old_versions',
dirname(__FILE__) . '/../phpBB/cache', dirname(__FILE__) . '/../phpBB/cache',
dirname(__FILE__) . '/../phpBB/ext',
dirname(__FILE__) . '/../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 // 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 // https://gist.github.com/e003913ffd493da63cbc
dirname(__FILE__) . '/../phpBB/vendor', dirname(__FILE__) . '/../phpBB/vendor',