Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/zendframework/zendframework#6671-fixed-paralleli…
Browse files Browse the repository at this point in the history
…zed-cs-checks'

Close zendframework/zendframework#6671
  • Loading branch information
Ocramius committed Sep 16, 2014
180 parents e94fb19 + 7a203fa + 2a04582 + ffbdc09 + 3e2953a + bf81393 + 9eea463 + 278e5fc + f2f9883 + ee610ed + ef00595 + 546ed4b + 1e282f1 + 5a0e97e + 9b1b995 + 1f178dc + 19afffe + 3b1a256 + a01e488 + 6bd5417 + 7884984 + d7ead03 + ad447f0 + 30abd77 + 886c7dd + 0426e59 + 41bb0b6 + 48830b0 + d6e3cec + 3f64575 + 47056cf + 93da274 + 41ff6ee + 4d95164 + b49f56a + d9ca3c4 + eff94af + baa6f68 + b8d6e5f + cf90e76 + a38e673 + ddc5b11 + 203f4f2 + f755a1b + 7b4bdc5 + de1dabc + cffd7da + e68b46a + 6a4a61e + a495238 + 22ee4fd + 7c48789 + 88fc985 + 33867a8 + 72cc708 + 1253b9d + b527198 + 9f385cb + 9681d38 + 9ff4ea7 + 9dcc02b + a3b5a44 + 49aa6e1 + 785d144 + 6cb9145 + 98ba294 + 1a26005 + 6a37670 + 53069e2 + cdc28f8 + 7ed9b6d + 6aa8b3f + b08f0db + c6ffcad + 2e788ed + 5fa8668 + 331098b + 11a5300 + d15662e + a652577 + 113da58 + ac8c434 + 51dd55f + b8f65f9 + 5ab3ccd + 3c9d616 + 34eee47 + 1fc6a29 + 0f06888 + 781c1e1 + bfb1248 + adb0888 + 20476b6 + f0f3028 + fd934a8 + 039bd26 + 70f3e5a + 3d9849b + 118afdb + 029c839 + 31a4435 + fa239e0 + 18c2969 + 28b9d7b + 34e166a + 9e19c9d + 1645624 + 0f36602 + 32da7d8 + 9cd65f3 + 10a2ceb + f8a3f38 + 7b59c4b + 281109c + e15b4b2 + 00a7ba9 + d3f35c0 + e89516e + cbf495f + 89118d6 + 4f9b8b7 + d51ad32 + bdfd7d8 + 0dc32e4 + ca27a0e + b0b5deb + 8f5f165 + e85eb90 + 8f6f830 + 6a31d61 + 54ae670 + 1cad3f0 + beb876e + d725de0 + bf57c7d + 822964a + 669aa66 + 76422ec + 62cdf38 + cbe43a2 + 6b3919c + 832c96f + 72e3bd6 + 5cfa5d3 + f012f21 + 49e3436 + 465b2ed + 91cc8bb + 86b4350 + e32c680 + d82c755 + b9aa141 + ab2eabe + dc44bfd + b6b709b + a532720 + da21aec + c5778b9 + 0c4bddf + 2949069 + 32cca05 + 351e176 + ae57563 + aaa4dad + 8002f21 + 8609d03 + 81091aa + 1abecc5 + 99e065a + be2b2d8 + 4043721 + 4b52b1f + adf262d + 1c20c0f + f380ca1 + a14332b + ccca4d8 + 0db0a30 + 40c2339 + 456b7d6 commit 89c7725
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
14 changes: 10 additions & 4 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
->notPath('ZendTest/Loader/TestAsset')
->notPath('demos')
->notPath('resources')
// Following are necessary when you use `parallel` or specify a path
// from the project root.
->notPath('Stream.php')
->notPath('Generator/TestAsset')
->notPath('Reflection/FunctionReflectionTest.php')
->notPath('Reflection/MethodReflectionTest.php')
->notPath('Reflection/TestAsset')
->notPath('TestAsset')
->notPath('_files')
->filter(function (SplFileInfo $file) {
if (strstr($file->getPath(), 'compatibility')) {
return false;
}
})
->in(__DIR__ . '/library')
->in(__DIR__ . '/tests')
->in(__DIR__ . '/bin');
});
$config = Symfony\CS\Config\Config::create();
$config->fixers(
array(
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ before_script:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php

script:
- vendor/bin/php-cs-fixer fix -v --dry-run
# Run coding standard checks in parallel
- ls -d library/Zend/* tests/ZendTest/* bin | parallel --gnu --keep-order 'echo "Running {} CS checks"; ./vendor/bin/php-cs-fixer fix {} -v --dry-run --config-file=.php_cs;' || exit 1
# Run tests for the various components in parallel
- ls -d tests/ZendTest/* | parallel --gnu --keep-order 'echo "Running {} tests"; ./vendor/bin/phpunit -c tests/phpunit.xml.dist --coverage-php build/coverage/coverage-{/.}.cov {};' || exit 1

Expand Down

0 comments on commit 89c7725

Please sign in to comment.