Merge pull request #7 from nextcloud/php-cs-fixer-3

use php-cs-fixer ^3.2
nextcloud · Nov 10, 2021 · 0c25047 · 0c25047
2 parents 68370dd + 38f3845
commit 0c25047
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ composer.phar
 /.idea
 
 .php_cs.cache
+.php-cs-fixer.cache
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
diff --git a/composer.json b/composer.json
@@ -3,8 +3,8 @@
     "description": "Nextcloud coding standards for the php cs fixer",
     "type": "library",
     "require": {
-        "php": "^7.2|^8.0",
-        "friendsofphp/php-cs-fixer": "^2.17"
+        "php": "^7.3|^8.0",
+        "friendsofphp/php-cs-fixer": "^3.2"
     },
     "license": "MIT",
     "authors": [

diff --git a/src/Config.php b/src/Config.php
@@ -12,15 +12,12 @@ public function __construct($name = 'default') {
 		$this->setIndent("\t");
 	}
 
-	public function getRules() {
+	public function getRules() : array {
 		return [
 			'@PSR1' => true,
 			'@PSR2' => true,
 			'align_multiline_comment' => true,
 			'array_indentation' => true,
-			'array_syntax' => [
-				'syntax' => 'short',
-			],
 			'binary_operator_spaces' => [
 				'default' => 'single_space',
 			],
@@ -39,11 +36,10 @@ public function getRules() {
 			],
 			'indentation_type' => true,
 			'line_ending' => true,
-			'list_syntax' => [
-				'syntax' => 'short',
-			],
 			'lowercase_keywords' => true,
-			'method_argument_space' => [],
+			'method_argument_space' => [
+				'on_multiline' => 'ignore',
+			],
 			'no_closing_tag' => true,
 			'no_spaces_after_function_name' => true,
 			'no_spaces_inside_parenthesis' => true,