Skip to content

Commit

Permalink
Sync meta files.
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark committed Dec 19, 2019
1 parent 7c79492 commit 55cc08a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 16 deletions.
8 changes: 5 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -23,9 +23,11 @@
# 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
tooling.yml export-ignore
41 changes: 29 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,36 @@
# IDEs
/.idea
/.project
/nbproject
/.buildpath
/.settings
# IDE
.idea/
.project/
nbproject/
.buildpath/
.settings/
*.sublime-*

# OS
.DS_Store
*.AppleDouble
*.AppleDB
*.AppleDesktop

# OS
.DS_Store
# grunt stuff
.grunt
.sass-cache
/node_modules/

# tooling
vendor/
composer.lock
.phpunit.result.cache

# built client resources
src/*/Zed/*/Static/Public
src/*/Zed/*/Static/Assets/sprite

/vendor
/composer.lock
# Propel classes
src/*/Zed/*/Persistence/Propel/Base/*
src/*/Zed/*/Persistence/Propel/Map/*

/tests/_output/*
!/tests/_output/.gitkeep
# tests
tests/**/_generated/
tests/_output/*
!tests/_output/.gitkeep
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ before_install:

install:
- COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction
- if [[ $PREFER_LOWEST == 1 ]]; then COMPOSER_MEMORY_LIMIT=-1 composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi
- 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/
Expand Down

0 comments on commit 55cc08a

Please sign in to comment.