Skip to content

Commit

Permalink
Added load of stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
hassankhan committed Feb 22, 2015
1 parent ede316f commit 17e10e9
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 44 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
tests/coverage
vendor
composer.lock
build
Expand Down
35 changes: 35 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
filter:
excluded_paths: [tests/*]
checks:
php:
code_rating: true
remove_extra_empty_lines: true
remove_php_closing_tag: true
remove_trailing_whitespace: true
fix_use_statements:
remove_unused: true
preserve_multiple: false
preserve_blanklines: true
order_alphabetically: true
fix_php_opening_tag: true
fix_linefeed: true
fix_line_ending: true
fix_identation_4spaces: true
fix_doc_comments: true
tools:
external_code_coverage:
timeout: 600
runs: 3
php_analyzer: true
php_code_coverage: false
php_code_sniffer:
config:
standard: PSR2
filter:
paths: ['src']
php_loc:
enabled: true
excluded_dirs: [vendor, tests]
php_cpd:
enabled: true
excluded_dirs: [vendor, tests]
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
language: php

branches:
only:
- master
- develop

before_script:
- composer self-update
- composer update --prefer-source

script: phpunit --testsuite travis-ci

php:
- 5.3
- 5.4
Expand All @@ -21,3 +10,13 @@ php:
matrix:
allow_failures:
- php: hhvm

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source --dev

script:
- phpunit --coverage-text --coverage-clover=coverage.clover

after_script:
- php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
13 changes: 10 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "noodlehaus/config",
"type": "library",
"description": "lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
"description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
"keywords": ["configuration", "config", "json", "yaml", "yml", "ini", "xml", "unframework", "microphp"],
"homepage": "http://noodlehaus.github.io/config/",
"license": "MIT",
Expand All @@ -16,15 +16,22 @@
"homepage": "http://hassankhan.me/"
}],
"require": {
"php": ">= 5.3.0",
"php" : ">=5.3.0",
"symfony/yaml": "~2.5"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit" : "4.*",
"scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.2"
},
"autoload": {
"psr-4": {
"Noodlehaus\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Noodlehaus\\Test\\": "tests"
}
}
}
48 changes: 22 additions & 26 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,37 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
bootstrap="tests/bootstrap.php"
colors="true"
forceCoversAnnotation="true">

<testsuite name="all-tests">
<directory>tests</directory>
</testsuite>

<testsuite name="travis-ci">
<directory>tests</directory>
</testsuite>

<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
forceCoversAnnotation="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Config Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">./src</directory>
<directory suffix=".php">src/</directory>
<exclude>
<directory suffix=".php">./src/Exception</directory>
</exclude>
</whitelist>
</filter>

<logging>
<log type="coverage-text"
target="php://stdout"
showUncoveredFiles="false"/>
<log type="coverage-html"
target="tests/coverage"
charset="UTF-8"
yui="true"
highlight="true"
lowUpperBound="40"
highLowerBound="70" />
<log type="tap" target="build/report.tap"/>
<log type="junit" target="build/report.junit.xml"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>

</phpunit>
3 changes: 0 additions & 3 deletions tests/bootstrap.php

This file was deleted.

0 comments on commit 17e10e9

Please sign in to comment.