diff options
author | Lukas Reschke <lukas@owncloud.com> | 2016-03-16 17:17:27 +0300 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2016-03-16 19:31:18 +0300 |
commit | e71ebf334da958f23b2a70cd92a8dd46f77bee12 (patch) | |
tree | 6518d7b8954ee37da59d2df48353e6765be2d930 | |
parent | 08b91939199f7705a35f79d734f2f4bf6dafca4f (diff) |
[stable9] Execute parallel-lint
Backport of #22994 and #23303
-rw-r--r-- | .travis.yml | 9 | ||||
-rw-r--r-- | composer.json | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 0f6a027d061..529fd1c0975 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ install: script: + - sh -c "if [ '$TC' = 'syntax' ]; then composer install && vendor/bin/parallel-lint --exclude vendor/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ .; fi" - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi" - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi" @@ -42,5 +43,13 @@ matrix: env: DB=sqlite;TC=carddav - php: 5.4 env: DB=sqlite;TC=caldav + - php: 5.4 + env: DB=sqlite;TC=syntax + - php: 5.5 + env: DB=sqlite;TC=syntax + - php: 5.6 + env: DB=sqlite;TC=syntax + - php: 7.0 + env: DB=sqlite;TC=syntax fast_finish: true diff --git a/composer.json b/composer.json new file mode 100644 index 00000000000..754925d58a7 --- /dev/null +++ b/composer.json @@ -0,0 +1,6 @@ +{ + "require-dev": { + "jakub-onderka/php-parallel-lint": "^0.9.2", + "jakub-onderka/php-console-highlighter": "^0.3.2" + } +} |