Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
},
"overrides": [
{
"files": ["*.jsx"],
"files": ["*.jsx", "*.js"],
"env": {
"jest": true
},
"rules": {
"@typescript-eslint/explicit-module-boundary-types": ["off"]
}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set Node.js 16.x
- name: Set Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x

- name: Run install
uses: borales/actions-yarn@v4
Expand Down
33 changes: 14 additions & 19 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,35 @@
name: PHP
on: [push]

jobs:
lint-test:
name: ${{ matrix.php-versions }} Lint & Test
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php-versions: ['8.1']
php-versions: ['8.3']

steps:
- name: Checkout
uses: actions/checkout@v3

# Docs: https://github.com/shivammathur/setup-php
- name: Setup PHP
uses: shivammathur/setup-php@v2
- name: Cache Composer dependencies
uses: actions/cache@v3
with:
php-version: ${{ matrix.php-versions }}
path: /tmp/composer-cache
key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}

- name: Get composer cache directory
id: composer-cache
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- uses: actions/cache@v3
- name: Setup PHP
uses: php-actions/composer@v6
with:
path: ${{ steps.composer-cache.outputs.dir }}
# Use composer.json for key, if composer.lock is not committed.
# key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
php_version: ${{ matrix.php-versions }}

- name: Install Composer dependencies
run: composer update
- name: Validate Composer
run: composer validate --strict

- name: PHP Lint
run: composer run lint:php
run: composer run lint

- name: PHP test
run: composer run test:php
run: composer run test
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
. "$(dirname -- "$0")/_/husky.sh"

yarn lint:js && yarn test:js
composer run lint:php
composer run test:php
composer run lint
composer run test
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20.11
16 changes: 7 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
"license": "proprietary",
"require-dev": {
"phpunit/phpunit": "^9.4",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"wp-coding-standards/wpcs": "^2.3",
"automattic/vipwpcs": "^2.2",
"brain/monkey": "^2.6"
"brain/monkey": "^2.6",
"newsuk/nuk-wp-phpcs-config": "^0.1.0"
},
"autoload": {
"psr-4": {
"MR\\FeatureFlags\\": ["includes/", "helper/"]
"MR\\FeatureFlags\\": ["includes/"]
}
},
"autoload-dev": {
Expand All @@ -24,10 +22,10 @@
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
},
"scripts": {
"lint:php": "phpcs .",
"lint:php-fix": "phpcbf .",
"test:php": "phpunit --dont-report-useless-tests --configuration ./phpunit.xml --testdox"
"lint": "phpcs .",
"lint:fix": "phpcbf .",
"test": "phpunit --dont-report-useless-tests --configuration ./phpunit.xml --testdox"
}
}
Loading