Merge pull request #142 from Majkl578/cs-4.0

CS 4.0, version composer.lock, merge stages

.gitattributes

@@ -5,3 +5,4 @@
 .travis.yml export-ignore
 phpunit.xml.dist export-ignore
 /phpcs.xml.dist export-ignore
+composer.lock export-ignore

.gitignore

@@ -1,5 +1,4 @@
 vendor/
-composer.lock
 build/
 /phpcs.xml
 /.phpcs-cache

.travis.yml

@@ -13,8 +13,10 @@ php:
 
 before_install:
   - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
+  - travis_retry composer self-update
 
 install:
+  - rm composer.lock
   - travis_retry composer -n --prefer-source install
 
 script: ./vendor/bin/phpunit
@@ -24,21 +26,23 @@ jobs:
     - php: nightly
 
   include:
-    - stage: Coverage
+    - stage: Test
+      env: COVERAGE
       before_script:
         - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
         - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
       script:
         - ./vendor/bin/phpunit --coverage-clover clover.xml
       after_script:
-        - wget https://scrutinizer-ci.com/ocular.phar
-        - php ocular.phar code-coverage:upload --format=php-clover clover.xml
+        - travis_retry wget https://scrutinizer-ci.com/ocular.phar
+        - travis_retry php ocular.phar code-coverage:upload --format=php-clover clover.xml
 
-    - stage: Coding standard
-      script:
-        - ./vendor/bin/phpcs
+    - stage: Code Quality
+      env: CODING_STANDARDS
+      install: travis_retry composer install --prefer-dist
+      script: ./vendor/bin/phpcs
 
-    - stage: Lint
-      before_script:
-        - travis_retry composer require --dev --prefer-dist --prefer-stable phpstan/phpstan:^0.8
+    - stage: Code Quality
+      env: STATIC_ANALYSIS
+      install: travis_retry composer install --prefer-dist
       script: vendor/bin/phpstan analyse -l 3 lib

composer.json

@@ -17,8 +17,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.3",
-        "doctrine/coding-standard": "~2.1.0",
-        "squizlabs/php_codesniffer": "^3.0"
+        "doctrine/coding-standard": "^4.0",
+        "phpstan/phpstan-shim": "^0.9.2"
     },
     "autoload": {
         "psr-4": { "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" }