Merge branch '2.16'

PHP-CS-Fixer · Jan 6, 2020 · 37fdc94 · 37fdc94
2 parents 7e24cc6 + e42cf6b
commit 37fdc94
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
     build:
         macos:
-            xcode: '10.1.0'
+            xcode: '11.3.0'
         steps:
             - checkout
 
@@ -12,10 +12,9 @@ jobs:
                     - cache-{{ checksum "composer.json" }}
 
             - run: brew update
-            - run: brew install php@7.2
-            - run: brew link --force --overwrite php@7.2
-            - run: php --version
-            - run: echo "memory_limit = 512M" > $(brew --prefix)/etc/php/7.2/conf.d/memory.ini
+            - run: brew remove python@2
+            - run: brew install php@7.4
+            - run: echo "memory_limit = 512M" > $(brew --prefix)/etc/php/7.4/conf.d/memory.ini
             - run: curl -sS https://getcomposer.org/installer | php
             - run: php composer.phar global show hirak/prestissimo -q || php composer.phar global require --no-interaction --no-progress --optimize-autoloader hirak/prestissimo
             - run: php composer.phar install --optimize-autoloader --no-interaction --no-progress --no-suggest

diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ jobs:
     include:
         -
             stage: Static Code Analysis
-            php: 7.3
+            php: 7.4
             env: COMPOSER_FLAGS="--prefer-stable"
             install:
                 - travis_retry ./dev-tools/install.sh
@@ -81,12 +81,14 @@ jobs:
             <<: *STANDARD_TEST_JOB
             stage: Test
             php: 7.1
+            name: 7.1 | Symfony 4.1
             env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.1.0"
 
         -
             <<: *STANDARD_TEST_JOB
             stage: Test
             php: 7.2
+            name: 7.2 | Symfony 5.0
             env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="^5.0"
 
         -
@@ -95,13 +97,13 @@ jobs:
             php: 7.3
             name: 7.3 | With migration rules
             before_script:
-                - php php-cs-fixer fix --rules @PHP71Migration,@PHP71Migration:risky,blank_line_after_opening_tag -q || travis_terminate 1
+                - php php-cs-fixer fix --rules @PHP73Migration,@PHP71Migration:risky,blank_line_after_opening_tag -q || travis_terminate 1
 
         -
             <<: *STANDARD_TEST_JOB
             stage: Test
-            php: 7.3
-            name: 7.3 | Collect coverage
+            php: 7.4
+            name: 7.4 | Collect coverage
             before_install:
                 # for building a tag release we don't need to collect code coverage
                 - if [ $TRAVIS_TAG ]; then travis_terminate 0; fi
@@ -118,7 +120,7 @@ jobs:
 
                 # Install PCOV
                 - |
-                    git clone --single-branch --branch=v1.0.2 --depth=1 https://github.com/krakjoe/pcov
+                    git clone --single-branch --branch=v1.0.6 --depth=1 https://github.com/krakjoe/pcov
                     cd pcov
                     phpize
                     ./configure
@@ -135,12 +137,12 @@ jobs:
         -
             <<: *STANDARD_TEST_JOB
             stage: Test
-            php: 7.4snapshot
+            php: nightly
             env: COMPOSER_FLAGS="--ignore-platform-reqs" PHP_CS_FIXER_IGNORE_ENV=1 SYMFONY_DEPRECATIONS_HELPER=weak
 
         -
             stage: Deployment
-            php: 7.3
+            php: 7.4
             install: ./dev-tools/build.sh
             script:
                 - PHP_CS_FIXER_TEST_ALLOW_SKIPPING_SMOKE_TESTS=0 vendor/bin/phpunit tests/Smoke/
@@ -159,3 +161,6 @@ jobs:
                     tags: true
             after_deploy:
                 - ./dev-tools/trigger-website.sh ${TRAVIS_TOKEN} ${TRAVIS_TAG}
+
+    allow_failures:
+        - php: nightly
diff --git a/dev-tools/composer.json b/dev-tools/composer.json
@@ -3,7 +3,7 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "humbug/box": "~3.7.0",
+        "humbug/box": "^3.8",
         "localheinz/composer-normalize": "^1.1",
         "mi-schi/phpmd-extension": "^4.3",
         "phpmd/phpmd": "^2.6",

diff --git a/phpstan.neon b/phpstan.neon
@@ -11,6 +11,4 @@ parameters:
     ignoreErrors:
         - '/^.+::__construct\(\) does not call parent constructor from SplFileInfo\.$/'
         - '/^Return typehint of method PhpCsFixer\\Tests\\Test\\.+::createIsIdenticalStringConstraint\(\) has invalid type PHPUnit_Framework_Constraint_IsIdentical\.$/'
-        ## cannot analyse out of PHP 7.4
-        - '/^Constant T_FN not found\.$/'
         - '/^Class (Symfony\\Contracts\\EventDispatcher\\Event|Symfony\\Component\\EventDispatcher\\Event) not found.$/'