diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-29 22:46:28 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-29 22:46:28 +0200 |
| commit | b5fed65fe326d32268f46b5915f3d7402f844bae (patch) | |
| tree | 6c9d0b60fed1d498244fdf6c09111937bdac45ad /tests/lint_test.php | |
| parent | 518902ef515151e780e8b98a07d7a80a1d70de55 (diff) | |
| parent | fedd0ae7f35156cb5f929fc8067080a6ea153476 (diff) | |
| download | forums-b5fed65fe326d32268f46b5915f3d7402f844bae.tar forums-b5fed65fe326d32268f46b5915f3d7402f844bae.tar.gz forums-b5fed65fe326d32268f46b5915f3d7402f844bae.tar.bz2 forums-b5fed65fe326d32268f46b5915f3d7402f844bae.tar.xz forums-b5fed65fe326d32268f46b5915f3d7402f844bae.zip | |
Merge branch '3.0.x' into 3.1.x
* 3.0.x:
[ticket/13875] Ignore cache, ext, and store folder in lint test
Conflicts:
tests/lint_test.php
Diffstat (limited to 'tests/lint_test.php')
| -rw-r--r-- | tests/lint_test.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/lint_test.php b/tests/lint_test.php index fb43196bae..70046bdfd2 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -84,6 +84,8 @@ class phpbb_lint_test extends phpbb_test_case dirname(__FILE__) . '/../build/new_version', dirname(__FILE__) . '/../build/old_versions', 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 // https://gist.github.com/e003913ffd493da63cbc dirname(__FILE__) . '/../phpBB/vendor', |