diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 23:33:24 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-02 23:33:24 +0100 |
| commit | a8e29f08047ec294f46d3b2da93c1282b3d822c7 (patch) | |
| tree | 359a4516a3b193e095df4f0ae63bbea128fb0588 | |
| parent | dfe7896a4d31d5274b89418774a6e373719681ed (diff) | |
| parent | 1977a10efbc468ea1afd021cdfc213e954932e3b (diff) | |
| download | forums-a8e29f08047ec294f46d3b2da93c1282b3d822c7.tar forums-a8e29f08047ec294f46d3b2da93c1282b3d822c7.tar.gz forums-a8e29f08047ec294f46d3b2da93c1282b3d822c7.tar.bz2 forums-a8e29f08047ec294f46d3b2da93c1282b3d822c7.tar.xz forums-a8e29f08047ec294f46d3b2da93c1282b3d822c7.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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; } |