Merge pull request #1008 from WebDevStudios/release/wd_s-v3.5

Release/wd_s v3.5

.github/CODEOWNERS

@@ -1,3 +1,5 @@
 # Code Owners
-# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+## <https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners>
+
 * @khleomix

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,65 @@
-Closes #\_\_
+# Closes
 
-### DESCRIPTION
+<!--
+Please do not leave this blank, use this format to link issue numbers:
+[#WDS-123](https://webdevstudios.atlassian.net/browse/TICKET-NUMBER)
+-->
 
-- What did you do? Give us some context...
+## What type of PR is this? (put an x to all applicable)
 
-### SCREENSHOTS
+- [ ] 🍕 Feature
+- [ ] 🐛 Bug Fix
+- [ ] 📝 Documentation Update
+- [ ] 🎨 Style
+- [ ] 🧑‍💻 Code Refactor
+- [ ] 🔥 Performance Improvements
+- [ ] ✅ Test
+- [ ] 🤖 Build
+- [ ] 🔁 CI
+- [ ] 📦 Chore (Release)
+- [ ] ⏩ Revert
 
-![screenshot](https://dl.dropbox.com/s/8k8xh3tuj3g5340/wd_s-pr-template.jpg?dl=0)
+## Link to test
 
-### OTHER
+<!--
+Please do not leave this blank, use this format to link to testing environment:
+[Develop](https://wds.wdslab.com/)
+-->
 
-- [ ] Is this issue accessible? (Section 508/WCAG 2.0AA)
-- [ ] Does this issue pass all the linting? (PHPCS, ESLint, SassLint)
-- [ ] Does this pass CBT?
+## Description
 
-### STEPS TO VERIFY
+<!--
+Please do not leave this blank
+This PR [adds/removes/fixes/replaces] the [feature/bug/etc].
+-->
 
-How do we test this?
+## Related Tickets & Documents
 
-### DOCUMENTATION
+<!--
+Please use this format link issue numbers: Fixes #WDS-123
+https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
+-->
 
-Will this pull request require updating the wd_s [wiki](https://github.com/WebDevStudios/wd_s/wiki)?
+## Mobile & Desktop Screenshots/Recordings
+
+<!-- Visual changes require screenshots -->
+
+
+## Added tests?
+
+- [ ] 👍 yes
+- [ ] 🙅 no, because they aren't needed
+- [ ] 🙋 no, because I need help
+
+## Added to documentation?
+
+- [ ] 📜 README.md
+- [ ] 📓 [Confluence](https://webdevstudios.atlassian.net/wiki/spaces/wds1/pages/2988474566/Feature+Documentation)
+- [ ] 🙅 no documentation needed
+
+## Others
+
+- [ ] 🦮 Is this issue accessible? (Section 508/WCAG 2.0AA)
+- [ ] 🙌 Does this issue pass all the linting? (PHPCS, ESLint, SassLint)
+
+## [optional] Are there any post-deployment tasks we need to perform?

.github/workflows/assertions.yml

@@ -12,8 +12,8 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [14.x]
-                php-versions: ['7.4']
+                node-version: [16.x]
+                php-versions: ['8.0']
 
         steps:
             - name: Checkout repository
@@ -32,8 +32,8 @@ jobs:
               with:
                   node-version: ${{ matrix.node-version }}
 
-            - name: Use NPM 7
-              run: npm i -g npm@7
+            - name: Use NPM 8
+              run: npm i -g npm@8
 
             - name: Cache Node dependencies
               uses: actions/cache@v2

.github/workflows/deploy.yml

@@ -13,8 +13,8 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [14.x]
-                php-versions: ['7.4']
+                node-version: [16.x]
+                php-versions: ['8.0']
 
         steps:
             - name: Checkout repository

.nvmrc

@@ -1 +1 @@
-14
+16

.vscode/settings.json

@@ -7,5 +7,13 @@
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
 	"intelephense.format.enable": false,
-	"intelephense.stubs": [ "acf", "wordpress" ]
+	"intelephense.stubs": [ "acf", "wordpress" ],
+
+	"workbench.colorCustomizations": {
+		"activityBar.background": "#3F4040",
+		"activityBarBadge.background": "#f3713c",
+		"activityBarBadge.foreground": "#fff",
+		"statusBar.background": "#f3713c",
+		"statusBar.foreground": "#fff"
+	}
 }

README.md

@@ -27,18 +27,14 @@ I also support [Selective Refresh](https://make.wordpress.org/core/2016/03/22/im
 
 Not to mention, I use [Browsersync](https://www.browsersync.io/) so you can watch your project update in real-time while you work.
 
-Looking to use some of our custom Gutenberg blocks? It's easy! Add the [WDS Blocks](https://github.com/WebDevStudios/wds-blocks) plugin for a quick starter including our Accordion and Carousel blocks.
-
-Looking to use some of our Advanced Custom Fields Gutenberg Blocks? It's also easy! Add the [WDS ACF Blocks](https://github.com/WebDevStudios/wds-acf-blocks) plugin for a whole set of blocks built with ACF including: Accordion, Carousel, Call To Action, Fifty/Fifty, Hero, Recent Posts, and Related Posts.
-
 ## Getting Started
 
 ### Prerequisites
 
 Because I compile and bundle assets via NPM scripts, basic knowledge of the command line and the following dependencies are required:
 
-- [Node](https://nodejs.org) (v14+)
-- [NPM](https://npmjs.com) (v7+)
+- [Node](https://nodejs.org) (v16+)
+- [NPM](https://npmjs.com) (v8+)
 - [Composer](https://getcomposer.org/)
 
 ### Quick Start
@@ -79,7 +75,7 @@ cd /wp-content/themes/your-theme
 
 Install theme dependencies and trigger an initial build.
 
->Note: You will need to have Composer and NPM 7 installed first.
+>Note: You will need to have Composer and NPM 8 installed first.
 
 ```bash
 npm i --legacy-peer-deps
@@ -96,6 +92,7 @@ Command | Action
 `npm run build` | Builds production-ready assets for a deployment
 `npm run lint` | Check all CSS, JS, MD, and PHP files for errors
 `npm run format` | Fix all CSS, JS, MD, and PHP formatting errors automatically
+`npm run report` | Gives detailed information on coding standards violations in PHP code
 
 ## Contributing and Support
 

composer.json

@@ -11,7 +11,7 @@
 	],
 	"config": {
 		"platform": {
-			"php": "7.4"
+			"php": "8.0"
 		},
 		"allow-plugins": {
 			"composer/installers": true,
@@ -23,15 +23,16 @@
 		"composer/installers": "^1.5 || ^2.0.0"
 	},
 	"require-dev": {
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-		"paulthewalton/acf-pro-stubs": "5.8.9.1",
-		"phpcompatibility/phpcompatibility-wp": "^2.1.1",
-		"wp-cli/wp-cli-bundle": "^2.5.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+		"php-stubs/acf-pro-stubs": "6.0.6",
+		"phpcompatibility/phpcompatibility-wp": "^2.1.4",
+		"wp-cli/wp-cli-bundle": "^2.7.1",
 		"wp-coding-standards/wpcs": "^2.3.0"
 	},
 	"scripts": {
 		"format": "phpcbf --report=summary,source",
-		"lint": "phpcs --report=summary,source",
+		"lint": "phpcs --report=code",
+		"report": "phpcs --report=info",
 		"pot": "wp i18n make-pot . build/languages/wd_s.pot --exclude=node_modules,vendor,build --allow-root"
 	}
 }