Merge pull request #7473 from Majkl578/incremental-cs-2.x

Incremental CS checks in 2.x branches

.gitignore

@@ -12,6 +12,5 @@ lib/Doctrine/DBAL
 .idea
 *.iml
 vendor/
-composer.lock
 /tests/Doctrine/Performance/history.db
 /.phpcs-cache

.travis.yml

@@ -77,7 +77,7 @@ jobs:
 
  - stage: Code Quality
  env: DB=none STATIC_ANALYSIS
- install: travis_retry composer update --prefer-dist --prefer-stable
+ install: travis_retry composer install --prefer-dist
  before_script:
  - echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
  - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
@@ -90,13 +90,32 @@ jobs:
  script: php phpbench.phar run -l dots --report=default
 
  - stage: Code Quality
+ if: NOT type = pull_request
  env: DB=none CODING_STANDARDS
- php: nightly
+ php: 7.1
+ install: travis_retry composer install --prefer-dist
  script:
  - ./vendor/bin/phpcs
 
+ - stage: Code Quality
+ if: type = pull_request
+ env: DB=none PULL_REQUEST_CODING_STANDARDS
+ php: 7.1
+ install: travis_retry composer install --prefer-dist
+ script:
+ - |
+ if [ $TRAVIS_BRANCH != "master" ]; then
+ git remote set-branches --add origin $TRAVIS_BRANCH;
+ git fetch origin $TRAVIS_BRANCH;
+ fi
+ - git merge-base origin/$TRAVIS_BRANCH $TRAVIS_PULL_REQUEST_SHA || git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge --unshallow
+ - wget https://github.com/diff-sniffer/git/releases/download/0.2.0/git-phpcs.phar
+ - php git-phpcs.phar origin/$TRAVIS_BRANCH...$TRAVIS_PULL_REQUEST_SHA
+
  allow_failures:
  - php: nightly
+ - stage: Code Quality
+ env: DB=none CODING_STANDARDS
 
 cache:
  directories:

composer.json

@@ -27,9 +27,8 @@
  "symfony/console": "~3.0|~4.0"
  },
  "require-dev": {
- "doctrine/coding-standard": "^1.0",
+ "doctrine/coding-standard": "^5.0",
  "phpunit/phpunit": "^6.5",
- "squizlabs/php_codesniffer": "^3.2",
  "symfony/yaml": "~3.4|~4.0"
  },
  "suggest": {