Merge pull request #1067 from ntwb/fix/editorconfig-json

EditorConfig: Relax 2 space indentation rule to only the `package.json
WordPress · Jul 10, 2017 · 0f578ea · 0f578ea
2 parents c29f11f + 9c12e12
commit 0f578ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{*.json,*.yml}]
+[{package.json,*.yml}]
 indent_style = space
 indent_size = 2
 

diff --git a/composer.json b/composer.json
@@ -1,12 +1,12 @@
 {
-  "require-dev": {
-    "squizlabs/php_codesniffer": "2.9.x",
-    "wp-coding-standards/wpcs": "dev-develop"
-  },
-  "scripts": {
-    "lint": "phpcs",
-    "post-install-cmd": [
-      "phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/"
-    ]
-  }
+	"require-dev": {
+		"squizlabs/php_codesniffer": "2.9.x",
+		"wp-coding-standards/wpcs": "dev-develop"
+	},
+	"scripts": {
+		"lint": "phpcs",
+		"post-install-cmd": [
+			"phpcs --config-set installed_paths ../../wp-coding-standards/wpcs/"
+		]
+	}
 }