Merge pull request #3077 from Majkl578/cs-4.0+fn-const-imports

CS bump to 4.0, imports for global functions & constants

.appveyor.yml

@@ -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
 

.gitattributes

@@ -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

.gitignore

@@ -5,6 +5,5 @@ dist/
 download/
 vendor/
 *.phpunit.xml
-composer.lock
 /phpunit.xml
 /.phpcs-cache

.travis.yml

@@ -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
 
@@ -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
@@ -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

composer.json

@@ -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",