Merge pull request #84 from Yoast/JRF/ghactions-add-merge-conflict-check #259

	name: CS

	on:
	# Run on all pushes and on all pull requests.
	push:
	pull_request:
	# Allow manually triggering the workflow.
	workflow_dispatch:

	jobs:
	actionlint:
	name: 'Lint GH Action workflows'
	uses: Yoast/.github/.github/workflows/reusable-actionlint.yml@main

	checkcs:
	name: 'Basic CS and QA checks'
	runs-on: ubuntu-latest

	steps:
	- name: Checkout code
	uses: actions/checkout@v4

	- name: Install PHP
	uses: shivammathur/setup-php@v2
	with:
	php-version: 'latest'
	coverage: none
	tools: cs2pr

	# Install dependencies and handle caching in one go.
	# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
	- name: Install Composer dependencies
	uses: "ramsey/composer-install@v3"
	with:
	# Bust the cache at least once a month - output format: YYYY-MM.
	custom-cache-suffix: $(date -u "+%Y-%m")

	# Validate the composer.json file.
	# @link https://getcomposer.org/doc/03-cli.md#validate
	- name: Validate Composer installation
	run: composer validate --no-check-all --strict

	# Check the code-style consistency of the PHP files.
	- name: Check PHP code style
	id: phpcs
	run: composer check-cs -- --no-cache --report-full --report-checkstyle=./phpcs-report.xml

	- name: Show PHPCS results in PR
	if: ${{ always() && steps.phpcs.outcome == 'failure' }}
	run: cs2pr ./phpcs-report.xml

Provide feedback