Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/composer.phar
/composer.lock
/box.phar
/vendor
/build
Expand Down
1 change: 1 addition & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ $finder = PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude('tests/Fixtures/app/cache')
->exclude('build')
->exclude('tests/e2e')
;

return PhpCsFixer\Config::create()
Expand Down
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,15 @@ script:
- if [[ $coverage = 1 ]]; then phpdbg -qrr phpunit-6.3.phar --coverage-clover build/logs/clover.xml; else php phpunit-6.3.phar; fi
- if [[ $lint = 1 ]]; then php php-cs-fixer.phar fix --dry-run --diff --no-ansi; fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the tests/e2e directory must be excluded in .php_cs.dist.

- if [[ $lint = 1 ]]; then phpstan analyse -l5 --ansi src; fi
- if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.1" ]]; then php box.phar build; fi;
- |
if [[ ! $deps && $TRAVIS_PHP_VERSION = "7.1" ]]; then
composer install --no-dev --prefer-dist --classmap-authoritative --no-progress --no-suggest --ansi;
php -d phar.readonly=0 box.phar build;
php schema.phar generate-types tmp/ tests/e2e/schema.yml;
diff tests/e2e/src/AppBundle/Entity/Person.php tmp/AppBundle/Entity/Person.php;
diff tests/e2e/src/AppBundle/Entity/PostalAddress.php tmp/AppBundle/Entity/PostalAddress.php;
diff tests/e2e/src/AppBundle/Entity/Thing.php tmp/AppBundle/Entity/Thing.php;
fi;

after_success:
- if [[ $coverage = 1 ]]; then travis_retry php coveralls.phar; fi
Expand Down
8 changes: 6 additions & 2 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"directories": ["src/"],
"directories": [
"data/",
"src/",
"templates/"
],
"finder": [
{
"name": "*.php",
Expand All @@ -11,7 +15,7 @@
"Tests",
"tests"
],
"in": "vendor"
"in": "vendor/"
}
],
"compactors": [
Expand Down
Loading