From dbef4294b888b7ee8cd9e75df8e570c2594c107d Mon Sep 17 00:00:00 2001
From: David Brownman <109395161+xavdid-stripe@users.noreply.github.com>
Date: Thu, 20 Jun 2024 10:17:04 -0700
Subject: [PATCH] update recommended extensions and settings (#1709)

---
 .editorconfig           |  2 +-
 .vscode/extensions.json |  9 ++++-----
 .vscode/settings.json   | 11 +++++------
 phpstan.neon.dist       |  4 ++++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 174e9120b..2d0fec721 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ charset = utf-8
 [*.{json,yml}]
 indent_size = 2
 
-[*.neon]
+[*.{neon,neon.dist}]
 indent_style = tab
 
 [Makefile]
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index db1056ca7..45314f805 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,9 +1,8 @@
 {
   "recommendations": [
-    "felixfbecker.php-intellisense",
-    "ikappas.phpcs",
-    "emallin.phpunit",
-    "EditorConfig.editorconfig",
-    "sophisticode.php-formatter"
+    "EditorConfig.editorconfig", // standard
+    "bmewburn.vscode-intelephense-client", // intellisense
+    "emallin.phpunit", // nice unit-testing runners
+    "SanderRonde.phpstan-vscode" // linting
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d1ae331e1..2a97389de 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,12 +4,11 @@
 
   "editor.renderWhitespace": "all",
 
+  "[php]": {
+    "editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
+  },
+
   // Formatting
   "editor.formatOnSave": true,
-  "phpformatter.composer": true,
-  "phpformatter.arguments": [""],
-
-  // Linting
-  "phpcs.enable": true,
-  "phpcs.standard": "PSR2"
+  "intelephense.format.braces": "psr12"
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 983b38e60..0f6df7019 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -11,3 +11,7 @@ parameters:
 		- '#Unsafe usage of new static\(\).#'
 
 	reportUnmatchedIgnoredErrors: false
+
+	paths:
+		- lib
+		- tests