diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 23:32:39 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 23:32:39 +0100 |
| commit | 1977a10efbc468ea1afd021cdfc213e954932e3b (patch) | |
| tree | 6f6ccec62275b87aebeeb035401e33bcc9a0d41c | |
| parent | be338864efd8878e6ec6ca32545b991be3656f6a (diff) | |
| parent | 981df153d2fbeba5f9aa6a677e11f1df15b3ea15 (diff) | |
| download | forums-1977a10efbc468ea1afd021cdfc213e954932e3b.tar forums-1977a10efbc468ea1afd021cdfc213e954932e3b.tar.gz forums-1977a10efbc468ea1afd021cdfc213e954932e3b.tar.bz2 forums-1977a10efbc468ea1afd021cdfc213e954932e3b.tar.xz forums-1977a10efbc468ea1afd021cdfc213e954932e3b.zip | |
Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympus
* bantu/ticket/11699:
[ticket/11699] Also exclude the phpBB/cache directory.
[ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
[ticket/11699] Exclude build/new_version and build/old_versions from lint.
| -rw-r--r-- | tests/lint_test.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/lint_test.php b/tests/lint_test.php index 905067072d..eba117839b 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -23,6 +23,10 @@ class phpbb_lint_test extends phpbb_test_case } self::$exclude = array( + dirname(__FILE__) . '/../.git', + dirname(__FILE__) . '/../build/new_version', + dirname(__FILE__) . '/../build/old_versions', + dirname(__FILE__) . '/../phpBB/cache', // 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', @@ -45,7 +49,7 @@ class phpbb_lint_test extends phpbb_test_case $dh = opendir($root); while (($filename = readdir($dh)) !== false) { - if ($filename == '.' || $filename == '..' || $filename == 'git') + if ($filename == '.' || $filename == '..') { continue; } |