Combine develop and trunk

Author: Clorith

.docker/config/certs/localhost.crt

@@ -0,0 +1,24 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+# WordPress Coding Standards
+# https://make.wordpress.org/core/handbook/coding-standards/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[{*.txt,wp-config-sample.php}]
+end_of_line = crlf

.docker/config/certs/localhost.key

@@ -3,15 +3,10 @@ module.exports = {
 	"extends": [
 		"plugin:@wordpress/eslint-plugin/esnext"
 	],
-	overrides: [
-		{
-			files: [ 'assets/javascript/**/*.js' ],
-			globals: {
-				jQuery: true,
-				document: true,
-				window: true,
-				wp: true,
-			}
-		}
-	]
-};
+	globals: {
+		jQuery: true,
+		document: true,
+		window: true,
+		wp: true,
+	}
+};

.docker/config/db/my.cnf

@@ -18,30 +18,27 @@ this kind of valuable input.
 
 
 ## Contributing with documentation
-The directory `docs` has our plugins readme, changelog and handbook content.
+The directory `docs` has any documentation that for the plugin which will be included in a release, such as the readme and changelog.
+
+Plugin assets, like screenshots and similar are found in the `assets` directory.
 
 The handbook lives on the WordPress.org Support Team's site, at https://make.wordpress.org/support/handbook/appendix/troubleshooting-using-the-health-check/.
-The structure of this document will be replicated to the website, and allows us to educate users and
-developers on the benefits of the plugin and how to use it.
 
 
 ## Contributing with code
 
-When contributing through code, please make sure each feature is developed as a separate, forked, branch of `develop`.
-
-The `master` branch of the repository is kept in a stable state, and should at any given time always be the most recent public release of the plugin.
+When contributing through code, please make sure each feature is developed as a separate, forked, branch of `trunk`.
 
-By splitting them up, we are able to make point releases without affecting already developed features intended for future major versions.
+The `trunk` branch is the most recent beta of the plugin at any given time, stable releases of the plugin may be downloaded from the [GitHub releases page](https://github.com/WordPress/health-check/releases), or from the [WordPress.org plugins page](https://wordpress.org/plugins/health-check/).
 
 You do not need a local development environment set up to make code changes, although it is useful
 when making changes to JavaScript or SASS (CSS styles) as these are concatenated by our build tools,
 and are only provided in raw form in the repository.
 
-The project has 4 primary directories:
-- `assets`, which holds JavaScript and SASS files.
-- `bin`, which holds a shellscript to install the framework for running unit tests.
+The project has 3 primary directories:
 - `src`, which contains general source files for the project.
-- `tests`, where unit tests are created. 
+- `tests`, where unit tests are created.
+- `docs`, which houses the plugin readme, its changelog, and potentially any other documentation which may prove valuable.
 
 Please do not change version numbers in when providing code changes, these are bumped by the project 
 maintainers when a new version is released, and any changes outside of this may lead to confusion.
@@ -50,30 +47,32 @@ maintainers when a new version is released, and any changes outside of this may
 ### Setting up a local environment
 
 If you wish to set up a local environment for working with the project, start off by installing 
-[node](https://nodejs.org), [npm](https://www.npmjs.com) (Node Package Manager) 
+[node](https://nodejs.org), [npm](https://www.npmjs.com) (Node Package Manager) or [yarn](https://yarnpkg.com/), 
 and [composer](https://getcomposer.org).
 
+This project favors yarn, but you may substitute `yarn` for `npm` in the commands below during your local development if you are more comfortable doing so.
+
 Once these are installed, you will want to open the command line in the project directory and
 execute the following commands:
 - `composer install` This will install composer dependencies, as defined in the `composer.json` file.
-- `npm install` This will install node modules that we use, as defined in the `package.json` file.
+- `yarn install` This will install node modules that we use, as defined in the `package.json` file.
+- `yarn run build` creates the `health-check` directory with all files for a finished plugin.
 
 #### Docker setup
- To make it easier to test your code on the go, a [Docker](https://www.docker.com/) configuration is prepared for you.
- Just run `docker-compose up` and wait for things to finish setting up. Once setup is complete, the following tools are available:
- - `http://health-check.localhost` the main WordPress site install
- - `http://health-check.localhost:8080` Adminer, a lightweight SQL editor
- - `http://health-check.localhost:8025` MailHog, captures emails so you don't need ot worry about spamming inboxes during testing.
- 
-The Health Check plugin will also be automatically added to the test site, although deactivated initially. Running the `grunt watch` task during development also guarantees your test site is always showing your latest changes.
+This project uses [wp-env](https://developer.wordpress.org/block-editor/packages/packages-env/) for it's Docker setup.
 
+Once you have built the project, you may use the `yarn run wp-env start` command to test your code. 
+
+The `yarn run wp-env` command is a placeholder, and you may pass any command that `wp-env` supports to it.
+
+For convenience sake, you may also run `yarn run watch` to automatically build any changes you make to the code during development.
+ 
 ### Submitting Pull Requests
 
 Once you've got your development environment set up, and you are ready to push your code, here
 are some items you should take note of
 - Does the code follow the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/)?
 - Did you include unit tests (if applicable)?
-- Was your local copy recently pulled from `master`, so it's a clean patch?
 
 When pushing, you should use a branch name that is short and describes what your code does.
 For example, if your code adds a feature for showing colors, naming it `feature-show-colors` makes

.docker/config/nginx/default.conf

@@ -1,17 +1,11 @@
 ## Short introduction
-- What ticket is the PR related to.
-- What is the gist of the solution.
+- What ticket, if any, is this pull request related to.
+- Give a short summary of the problem you are trying to solve.
 
 
 ## Description of what the PR accomplishes
-- A more thorough description of what problem the PR addresses and how.
+- A more thorough description of what problem the PR addresses and how the changes improve on them.
 
 
 ## Screenshots
 - If the changes included are visual, always include screenshots or screen casts, preferably showing both before and after.
-
-
-## PR Checklist
-These are things to ensure are covered by your PR.
-- [ ] This PR is created against the `develop` branch
-- [ ] This PR is feature ready and can be reviewed in its entirety

.docker/config/php-fpm/php.ini

@@ -0,0 +1,117 @@
+name: Coding Standards
+
+on:
+  push:
+    branches:
+      - trunk
+  pull_request:
+
+jobs:
+  # Runs PHP coding standards checks.
+  #
+  # Violations are reported inline with annotations.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Sets up PHP.
+  # - Logs debug information.
+  # - Installs Composer dependencies (use cache if possible).
+  # - Make Composer packages available globally.
+  # - Logs PHP_CodeSniffer debug information.
+  # - Runs PHPCS on the full codebase with warnings suppressed.
+  phpcs:
+    name: PHP coding standards
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'WordPress/health-check' || github.event_name == 'pull_request' }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+          tools: composer, cs2pr
+
+      - name: Log debug information
+        run: |
+          php --version
+          composer --version
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v1
+        with:
+          composer-options: "--no-progress --no-ansi --no-interaction"
+
+      - name: Make Composer packages available globally
+        run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
+
+      - name: Log PHPCS debug information
+        run: phpcs -i
+
+      - name: Run PHPCS on all Core files
+        run: phpcs -q -n --report=checkstyle | cs2pr
+
+      - name: Check test suite files for warnings
+        run: phpcs tests -q --report=checkstyle | cs2pr
+
+  # Runs the JavaScript and CSS coding standards checks.
+  #
+  # Performs the following steps:
+  # - Checks out the repository.
+  # - Logs debug information about the runner container.
+  # - Installs NodeJS 12 (todo: install the version of NPM specified in the `.nvmrc` file to support older branches)
+  # - Sets up caching for NPM.
+  # - Logs updated debug information.
+  # _ Installs dependencies.
+  # - Run the ESLint checks.
+  # - Run the StyleLint checks.
+  eslint:
+    name: JavaScript and CSS style linters
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'WordPress/health-check' || github.event_name == 'pull_request' }}
+    env:
+      PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Log debug information
+        run: |
+          yarn --version
+          node --version
+          git --version
+          svn --version
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Cache NodeJS modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-npm-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-npm-
+
+      - name: Log debug information
+        run: |
+          yarn --version
+          node --version
+
+      - name: Install Dependencies
+        run: yarn install
+
+      - name: Run ESLint
+        run: yarn run lint:js
+
+      - name: Run StyleLint
+        run: yarn run lint:css