Skip to content

Commit

Permalink
Update to Doctrine CS 4.0, version composer.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
Majkl578 committed Apr 1, 2018
1 parent 46069b6 commit fd0f0f3
Show file tree
Hide file tree
Showing 7 changed files with 2,405 additions and 6 deletions.
1 change: 1 addition & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ install:
}
}
# install composer dependencies
- rm composer.lock
- appveyor-retry php composer.phar self-update
- appveyor-retry php composer.phar install --no-progress --profile

Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ build.xml export-ignore
phpunit.xml.dist export-ignore
run-all.sh export-ignore
/phpcs.xml.dist export-ignore
/composer.lock export-ignore
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ dist/
download/
vendor/
*.phpunit.xml
composer.lock
/phpunit.xml
/.phpcs-cache
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ before_script:
- if [[ "$DB" == "mysql" || "$DB" == "mysqli" || "$DB" == *"mariadb"* ]]; then mysql < tests/travis/create-mysql-schema.sql; fi;

install:
- travis_retry composer -n install
- rm composer.lock
- travis_retry composer -n update --prefer-dist

script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml

Expand Down Expand Up @@ -343,6 +344,7 @@ jobs:
- stage: Pull request coding standard
if: type = pull_request
php: 7.1
install: travis_retry composer install --prefer-dist
script:
- |
if [ $TRAVIS_BRANCH != "master" ]; then
Expand All @@ -356,5 +358,6 @@ jobs:
- stage: Coding standard
if: NOT type = pull_request
php: 7.1
install: travis_retry composer install --prefer-dist
script:
- ./vendor/bin/phpcs
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"doctrine/common": "^2.7.1"
},
"require-dev": {
"doctrine/coding-standard": "^3.0",
"doctrine/coding-standard": "^4.0",
"phpunit/phpunit": "^7.0",
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
"symfony/console": "^2.0.5||^3.0",
Expand Down
Loading

0 comments on commit fd0f0f3

Please sign in to comment.