Update coding-standard to major version 3

owncloud · Jun 10, 2021 · 3fb14f9 · 3fb14f9
1 parent 2cb75c2
commit 3fb14f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -134,6 +134,9 @@ vendor-bin/**/composer.lock
 /config/autoconfig.php
 clover.xml
 /tests/output
+.php-cs-fixer.cache
+
+# old php-cs-fixer v2 files
 .php_cs.cache
 .php_cs
 

diff --git a/Makefile b/Makefile
@@ -216,13 +216,13 @@ test-acceptance-webui: $(acceptance_test_deps)
 
 .PHONY: test-php-style
 test-php-style: vendor-bin/owncloud-codestyle/vendor vendor-bin/php_codesniffer/vendor
-	$(PHP_CS_FIXER) fix -v --diff --diff-format udiff --allow-risky yes --dry-run
+	$(PHP_CS_FIXER) fix -v --diff --allow-risky yes --dry-run
 	$(PHP_CODESNIFFER) --cache --runtime-set ignore_warnings_on_exit --standard=phpcs.xml tests/acceptance tests/TestHelpers
 	php build/OCPSinceChecker.php
 
 .PHONY: test-php-style-fix
 test-php-style-fix: vendor-bin/owncloud-codestyle/vendor
-	$(PHP_CS_FIXER) fix -v --diff --diff-format udiff --allow-risky yes
+	$(PHP_CS_FIXER) fix -v --diff --allow-risky yes
 
 .PHONY: test-php-phan
 test-php-phan: vendor-bin/phan/vendor

diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json
@@ -1,6 +1,5 @@
 {
     "require": {
-      "owncloud/coding-standard": "^2.0"
+      "owncloud/coding-standard": "^3.0"
     }
   }
-