Skip to content

Commit

Permalink
Merge c13b264 into 78466e2
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-1-anderson committed Nov 30, 2017
2 parents 78466e2 + c13b264 commit f0d6918
Show file tree
Hide file tree
Showing 20 changed files with 6,951 additions and 517 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -26,6 +26,7 @@
!bin/console
!bin/symfony_requirements
/vendor/
/dependencies/*/vendor/

# Assets and user uploads
/web/bundles/
Expand All @@ -47,4 +48,4 @@
# Backup entities generated with doctrine:generate:entities command
*/Entity/*~

.idea
.idea
33 changes: 18 additions & 15 deletions .travis.yml
@@ -1,36 +1,39 @@
language: php

branches:
# Only test the master branch and SemVer tags.
only:
- master
- /^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+.*$/

matrix:
fast_finish: true
include:
- php: 7.2
env: 'SCENARIO=symfony4 HIGHEST_LOWEST="update"'
- php: 7.1
env: dependencies=highest
- php: 7.1
- php: 7.0
env: 'SCENARIO=symfony4'
- php: 7.0.11
env: 'SCENARIO=symfony3 HIGHEST_LOWEST="update"'
- php: 7.0.11
- php: 5.6
- php: 5.5
env: dependencies=lowest
- php: 5.4
env: dependencies=lowest
env: 'SCENARIO=symfony2 HIGHEST_LOWEST="update --prefer-lowest'

sudo: false

cache:
apt: true
directories:
- "$HOME/.composer/cache"
- "vendor"

before_install:
- composer selfupdate

install:
# Load composer dependencies.
- composer validate --no-check-all --ansi
- if [ -z "$dependencies" ]; then composer install --prefer-dist --optimize-autoloader -n; fi;
- if [ "$dependencies" = "lowest" ]; then composer update --prefer-dist --prefer-lowest --optimize-autoloader -n; fi;
- if [ "$dependencies" = "highest" ]; then composer update --prefer-dist --optimize-autoloader -n; fi;
- 'composer scenario "${SCENARIO}" "${HIGHEST_LOWEST-install}"'

script:
- ./scripts/run-tests.sh
- composer test

after_success:
- ./vendor/bin/coveralls -vvv
- travis_retry php vendor/bin/coveralls -v
34 changes: 28 additions & 6 deletions composer.json
Expand Up @@ -4,7 +4,7 @@
"type": "library",
"require": {
"php": ">=5.4",
"symfony/yaml": "^2.8.11|^3",
"symfony/yaml": "^2.8.11|^3|^4",
"dflydev/dot-access-data": "^1.1.0"
},
"license": "MIT",
Expand All @@ -13,17 +13,39 @@
"name": "Matthew Grasmick"
}
],
"minimum-stability": "dev",
"prefer-stable": true,
"minimum-stability": "stable",
"autoload": {
"psr-4": {
"Grasmash\\YamlExpander\\": "src/"
}
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.7",
"phpunit/phpunit": "^4.8|^5.5.4",
"satooshi/php-coveralls": "^1.0"
"phpunit/phpunit": "^4.8|^5.5.4",
"satooshi/php-coveralls": "^1.0.2|dev-master",
"squizlabs/php_codesniffer": "^2.7"
},
"scripts": {
"cs": "phpcs -n --standard=PSR2 src tests --exclude=Generic.Files.LineLength",
"cbf": "phpcbf -n --standard=PSR2 src tests --exclude=Generic.Files.LineLength",
"unit": "phpunit",
"lint": [
"find src -name '*.php' -print0 | xargs -0 -n1 php -l",
"find tests -name '*.php' -print0 | xargs -0 -n1 php -l"
],
"test": [
"@lint",
"@unit",
"@cs"
],
"scenario": "tests/scripts/install-scenario",
"post-update-cmd": "tests/scripts/prep-dependencies"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true,
"platform": {
"php": "5.5"
}
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit f0d6918

Please sign in to comment.