From 14734def54237c9426fe1156256dc8a9fc537ed5 Mon Sep 17 00:00:00 2001
From: Ryan Brown <rbrown1193@gmail.com>
Date: Thu, 8 Oct 2020 15:49:42 +1300
Subject: [PATCH] Added default formatting config for vscode for php,
 javascript and vue files

---
 .vscode/settings.json | 18 +++++++++++++++---
 composer.json         |  3 ++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index fc8a283..9d3ce22 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,10 @@
 {
+  "eslint.format.enable": true,
+  
+  // PHP CS Fixer doesn't have a PSR12 ruleset yet, but the PHP CS Fixer ruleset is similar
+  "php-cs-fixer.rules": "@PhpCsFixer,declare_strict_types",
+  "php-cs-fixer.allowRisky": true,
+
   "[html]": {
     "editor.formatOnSave": true
   },
@@ -6,12 +12,18 @@
     "editor.formatOnSave": true
   },
   "[javascript]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
   },
   "[vue]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[json]": {
     "editor.formatOnSave": true
-  }
+  },
+  "[php]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "junstyle.php-cs-fixer"
+  },
 }
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 80db975..147523e 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
     "vlucas/phpdotenv": "^3.4.0"
   },
   "require-dev": {
+    "friendsofphp/php-cs-fixer": "^2.13",
     "yiisoft/yii2-shell": "^2.0.3"
   },
   "autoload": {
@@ -51,4 +52,4 @@
       "@php craft setup/security-key"
     ]
   }
-}
+}
\ No newline at end of file