Skip to content

Commit

Permalink
Merge 9981ace into 029ee61
Browse files Browse the repository at this point in the history
  • Loading branch information
chadicus committed Aug 13, 2015
2 parents 029ee61 + 9981ace commit bd21987
Show file tree
Hide file tree
Showing 19 changed files with 758 additions and 598 deletions.
8 changes: 7 additions & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ tools:
php_mess_detector: true
php_code_sniffer:
config:
standard: PSR1
standard: PSR2
sensiolabs_security_checker: true
php_loc:
excluded_dirs:
- vendor
- tests
php_pdepend: true
php_sim: true
build_failure_conditions:
- 'elements.rating(<= D).new.exists' # No new classes/methods with a rating of D or worse allowed (useful for legacy code)
- 'issues.label("coding-style").new.exists' # No new coding style issues allowed
- 'issues.label("coding-style").new.count > 5' # More than 5 new coding style issues.
- 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity
- 'project.metric("scrutinizer.quality", < 6)' # Code Quality Rating drops below 6
19 changes: 13 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
sudo: false
language: php
php:
- 5.6
- 5.5
- 5.4
before_script:
- composer self-update || true
script: ./build.php
after_script: ./vendor/bin/coveralls -v
- 5.5
- 5.6
- 7
- hhvm
install: composer install
script: ./vendor/bin/phpunit --coverage-clover clover.xml
after_success: sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./vendor/bin/coveralls -v; fi'
matrix:
fast_finish: true
allow_failures:
- php: 7
- php: hhvm
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ We recommend including details of your particular usecase(s) with any issues or
and we can get things merged in quicker when we understand its expected usage.

## Building
Our [build](build.php) runs the code through our [coding standard](https://github.com/dominionenterprises/dws-coding-standard) and through our
Our [build](build.php) runs the code through our [coding standard](http://www.php-fig.org/psr/psr-2/) and through our
test suite. Failures in either will keep us from merging the pull request. The test suite MUST have 100% code coverage in the report.

## Travis CI
Expand Down
3 changes: 1 addition & 2 deletions build.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@

$phpcsCLI = new PHP_CodeSniffer_CLI();
$phpcsArguments = [
'standard' => [__DIR__ . '/vendor/dominionenterprises/dws-coding-standard/DWS'],
'standard' => ['PSR2'],
'files' => ['src', 'tests', 'build.php'],
'warningSeverity' => 0,
];
$phpcsViolations = $phpcsCLI->process($phpcsArguments);
if ($phpcsViolations > 0) {
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"require-dev": {
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "~0.6.1",
"squizlabs/php_codesniffer": "~1.5",
"dominionenterprises/dws-coding-standard": "~1.1"
"squizlabs/php_codesniffer": "~2.0"
},
"autoload": {
"psr-4": { "DominionEnterprises\\": "src" }
Expand Down

0 comments on commit bd21987

Please sign in to comment.