Merge branch '2.15' into 2.16

PHP-CS-Fixer · Oct 27, 2020 · ac98e77 · ac98e77
2 parents ad3cb59 + c3b49b0
commit ac98e77
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -32,7 +32,6 @@ install:
     - echo extension=php_mbstring.dll >> php.ini
     - IF NOT EXIST C:\tools\composer.phar (cd C:\tools && appveyor DownloadFile https://getcomposer.org/composer-stable.phar -FileName composer.phar)
     - cd C:\projects\php-cs-fixer
-    - php C:\tools\composer.phar global show hirak/prestissimo -q || php C:\tools\composer.phar global require hirak/prestissimo
 
 before_test:
     - cd C:\projects\php-cs-fixer

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,6 @@ jobs:
             - run: brew install [email protected]
             - 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
             - run: php composer.phar info -D | sort
 

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.php_cs
+/.phpunit.result.cache
 /box.json
 /composer.lock
 /php-cs-fixer.phar

diff --git a/.travis.yml b/.travis.yml
@@ -20,8 +20,8 @@ before_install:
     # turn off XDebug
     - phpenv config-rm xdebug.ini || return 0
 
-    # Composer: boost installation
-    - composer global show hirak/prestissimo -q || travis_retry composer global require $DEFAULT_COMPOSER_FLAGS hirak/prestissimo
+    # Composer v2
+    - composer self-update --2
 
 jobs:
     include:
@@ -115,8 +115,8 @@ jobs:
                 # turn off XDebug
                 - phpenv config-rm xdebug.ini || return 0
 
-                # Composer: boost installation
-                - composer global show hirak/prestissimo -q || travis_retry composer global require $DEFAULT_COMPOSER_FLAGS hirak/prestissimo
+                # Composer v2
+                - composer self-update --2
 
                 # Require PHPUnit 8
                 - composer require --dev --no-update phpunit/phpunit:^8

diff --git a/dev-tools/check_file_permissions.sh b/dev-tools/check_file_permissions.sh
@@ -5,6 +5,7 @@ files_with_wrong_permissions=$(
     git ls-files --stage . \
         ':!*.sh' \
         ':!php-cs-fixer' \
+        ':!dev-tools/*.php' \
     | grep -P "^100\d\d(1|3|5|7) " \
     | sort -fh
 )

diff --git a/dev-tools/info-extractor.php b/dev-tools/info-extractor.php
diff --git a/dev-tools/install.sh b/dev-tools/install.sh
@@ -20,12 +20,14 @@ cd "$(dirname "$0")"
 
 mkdir -p bin
 
-VERSION_CB="2.0.0.2"
+VERSION_CB="2.20.4"
 VERSION_SC="stable"
 
 echo λλλ checkbashisms
 if [ ! -x bin/checkbashisms ]; then
-    wget -Obin/checkbashisms https://sourceforge.net/projects/checkbaskisms/files/${VERSION_CB}/checkbashisms/download
+    wget -qO- "https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_${VERSION_CB}.tar.xz" \
+        | tar -xJv -O devscripts-${VERSION_CB}/scripts/checkbashisms.pl \
+        > bin/checkbashisms
     chmod u+x bin/checkbashisms
 fi
 bin/checkbashisms --version

diff --git a/phpstan.neon b/phpstan.neon
@@ -47,4 +47,7 @@ parameters:
         -
             message: '/^Parameter #1 \$finder of method PhpCsFixer\\Config::setFinder\(\) expects iterable<string>, int given\.$/'
             path: tests/ConfigTest.php
+        -
+            message: '/^Unreachable statement - code above always terminates\.$/'
+            path: tests/AutoReview/DocumentationTest.php
     tipsOfTheDay: false