Merge branch '2.0' into 3.0

mnocon · mnocon · commit b6fffd4b0da9 · 2022-04-26T12:12:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 /vendor/
 composer.lock
-.php_cs.cache
 /.phpunit.result.cache
+.php-cs-fixer.cache
diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         }
     },
     "scripts": {
-        "fix-cs": "php-cs-fixer fix -v --show-progress=estimating",
+        "fix-cs": "php-cs-fixer fix -v --show-progress=dots",
         "check-cs": "@fix-cs --dry-run",
         "test": "phpunit"
     },

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`}`
`46`	`46`	`},`
`47`	`47`	`"scripts": {`
`48`		`- "fix-cs": "php-cs-fixer fix -v --show-progress=estimating",`
	`48`	`+ "fix-cs": "php-cs-fixer fix -v --show-progress=dots",`
`49`	`49`	`"check-cs": "@fix-cs --dry-run",`
`50`	`50`	`"test": "phpunit"`
`51`	`51`	`},`