Merge pull request #510 from lcobucci/7.1.x-merge-up-into-7.2.x_RgT4Fg51

Merge release 7.1.1 into 7.2.x
lcobucci · Apr 3, 2023 · 4e9ec1f · 4e9ec1f
2 parents f260e88 + aaefab9
commit 4e9ec1f
Show file tree

Hide file tree

Showing 13 changed files with 700 additions and 835 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ infection:
 
 .PHONY: phpcbf
 phpcbf:
-	@vendor/bin/phpcbf --parallel=$(PARALLELISM)
+	@vendor/bin/phpcbf --parallel=$(PARALLELISM) || true
 
 .PHONY: phpcs
 phpcs:

diff --git a/composer-unused.php b/composer-unused.php
diff --git a/composer.json b/composer.json
@@ -58,8 +58,9 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
+            "infection/extension-installer": true,
             "phpstan/extension-installer": true,
-            "infection/extension-installer": true
+            "ocramius/package-versions": true
         },
         "preferred-install": "dist",
         "sort-packages": true