Update to Doctrine CS 4.0, version composer.lock

parent 46069b6b
...@@ -84,6 +84,7 @@ install: ...@@ -84,6 +84,7 @@ install:
} }
} }
# install composer dependencies # install composer dependencies
- rm composer.lock
- appveyor-retry php composer.phar self-update - appveyor-retry php composer.phar self-update
- appveyor-retry php composer.phar install --no-progress --profile - appveyor-retry php composer.phar install --no-progress --profile
......
...@@ -10,3 +10,4 @@ build.xml export-ignore ...@@ -10,3 +10,4 @@ build.xml export-ignore
phpunit.xml.dist export-ignore phpunit.xml.dist export-ignore
run-all.sh export-ignore run-all.sh export-ignore
/phpcs.xml.dist export-ignore /phpcs.xml.dist export-ignore
/composer.lock export-ignore
...@@ -5,6 +5,5 @@ dist/ ...@@ -5,6 +5,5 @@ dist/
download/ download/
vendor/ vendor/
*.phpunit.xml *.phpunit.xml
composer.lock
/phpunit.xml /phpunit.xml
/.phpcs-cache /.phpcs-cache
...@@ -24,7 +24,8 @@ before_script: ...@@ -24,7 +24,8 @@ before_script:
- if [[ "$DB" == "mysql" || "$DB" == "mysqli" || "$DB" == *"mariadb"* ]]; then mysql < tests/travis/create-mysql-schema.sql; fi; - if [[ "$DB" == "mysql" || "$DB" == "mysqli" || "$DB" == *"mariadb"* ]]; then mysql < tests/travis/create-mysql-schema.sql; fi;
install: 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 script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
...@@ -343,6 +344,7 @@ jobs: ...@@ -343,6 +344,7 @@ jobs:
- stage: Pull request coding standard - stage: Pull request coding standard
if: type = pull_request if: type = pull_request
php: 7.1 php: 7.1
install: travis_retry composer install --prefer-dist
script: script:
- | - |
if [ $TRAVIS_BRANCH != "master" ]; then if [ $TRAVIS_BRANCH != "master" ]; then
...@@ -356,5 +358,6 @@ jobs: ...@@ -356,5 +358,6 @@ jobs:
- stage: Coding standard - stage: Coding standard
if: NOT type = pull_request if: NOT type = pull_request
php: 7.1 php: 7.1
install: travis_retry composer install --prefer-dist
script: script:
- ./vendor/bin/phpcs - ./vendor/bin/phpcs
This diff is collapsed.
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<arg name="extensions" value="php"/> <arg name="extensions" value="php"/>
<arg name="parallel" value="80"/> <arg name="parallel" value="80"/>
<arg name="cache" value=".phpcs-cache"/> <arg name="cache" value=".phpcs-cache"/>
<arg name="colors" /> <arg name="colors"/>
<!-- Ignore warnings and show progress of the run --> <!-- Ignore warnings, show progress of the run and show sniff names -->
<arg value="np"/> <arg value="nps"/>
<file>lib</file> <file>lib</file>
<file>tests</file> <file>tests</file>
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/> <exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes"/>
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint"/> <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint"/>
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/> <exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint"/>
<exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
<exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
</rule> </rule>
<rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses"> <rule ref="PSR1.Classes.ClassDeclaration.MultipleClasses">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment