From 8ff521ef6efaed36dbf89c15704fc93fb457367c Mon Sep 17 00:00:00 2001 From: mscherer Date: Thu, 19 Dec 2019 14:39:07 +0100 Subject: [PATCH] Sync meta files. --- .gitattributes | 14 +++++++------- .gitignore | 16 +++++++++++++++- .travis.yml | 7 +++++-- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 806e436..190377b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,6 @@ +# Define the line ending behavior of the different file extensions # Set the default behavior, in case people don't have core.autocrlf set. -* eol=lf -* text=auto +* text text=auto eol=lf # Denote all files that are truly binary and should not be modified. *.png binary @@ -21,13 +21,13 @@ *.exe binary # Remove files for archives generated using `git archive` +codeception.yml export-ignore +dependency.json export-ignore +phpstan.json export-ignore +phpstan.neon export-ignore +tooling.yml export-ignore .coveralls.yml export-ignore .travis.yml export-ignore .editorconfig export-ignore .gitattributes export-ignore .gitignore export-ignore -codeception.yml export-ignore -dependency.json export-ignore -tooling.yml export-ignore -phpstan.neon -phpstan.json diff --git a/.gitignore b/.gitignore index 6e67ecf..58b3e11 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,20 @@ nbproject/ .sass-cache /node_modules/ -# Tooling +# tooling vendor/ composer.lock +.phpunit.result.cache + +# built client resources +src/*/Zed/*/Static/Public +src/*/Zed/*/Static/Assets/sprite + +# Propel classes +src/*/Zed/*/Persistence/Propel/Base/* +src/*/Zed/*/Persistence/Propel/Map/* + +# tests +tests/**/_generated/ +tests/_output/* +!tests/_output/.gitkeep diff --git a/.travis.yml b/.travis.yml index 7711d15..184b3e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: php php: - 7.2 - - 7.4snapshot + - 7.4 matrix: fast_finish: true @@ -17,15 +17,18 @@ env: - APPLICATION_STORE=DE before_install: - - if [[ ${TRAVIS_PHP_VERSION} != "7.4snapshot" ]]; then phpenv config-rm xdebug.ini ; fi + - phpenv config-rm xdebug.ini install: - COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction - if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction ; fi + - if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer require --dev dereuromark/composer-prefer-lowest; fi script: - find ./src -path src -prune -o -type f -name '*.php' -print0 | xargs -0 -n1 -P4 php -l -n | (! grep -v "No syntax errors detected" ) + - if [[ $PREFER_LOWEST == 1 ]]; then vendor/bin/validate-prefer-lowest || true; fi + cache: directories: - $HOME/.composer/cache/