Skip to content

Commit a963372

Browse files
authored
Merge branch 'trunk' into add-namespaces-and-autoloader
2 parents 69b8177 + 6040f6b commit a963372

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
# To get started with Dependabot version updates, you'll need to specify which
2-
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
4-
# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5-
61
version: 2
72
updates:
8-
- package-ecosystem: "composer" # See documentation for possible values
9-
directory: "/" # Location of package manifests
3+
- package-ecosystem: "composer"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
- package-ecosystem: "npm"
8+
directory: "/"
9+
schedule:
10+
interval: "daily"
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
1013
schedule:
1114
interval: "daily"

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: New tag
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v6
1212
- name: WordPress Plugin Deploy
1313
uses: 10up/action-wordpress-plugin-deploy@stable
1414
env:

.github/workflows/phpcs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v6
99
- name: Setup PHP
1010
uses: shivammathur/setup-php@v2
1111
with:
1212
php-version: '7.4'
1313
coverage: none
1414
tools: composer, cs2pr
1515
- name: Install Composer dependencies for PHP
16-
uses: "ramsey/composer-install@v2"
16+
uses: "ramsey/composer-install@v3"
1717
- name: Detect coding standard violations
1818
run: composer lint
1919

.github/workflows/phpunit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
phpunit: ['auto']
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v6
2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2
2323
with:
@@ -26,7 +26,7 @@ jobs:
2626
tools: composer, phpunit-polyfills
2727
extensions: mysql
2828
- name: Install Composer dependencies for PHP
29-
uses: "ramsey/composer-install@v2"
29+
uses: "ramsey/composer-install@v3"
3030
- name: Install SVN
3131
run: sudo apt-get update && sudo apt-get install -y subversion
3232
- name: Setup Test Environment

.github/workflows/update-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Push to trunk
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v6
1212
- name: WordPress.org plugin asset/readme update
1313
uses: 10up/action-wordpress-plugin-asset-update@stable
1414
env:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
2020
"squizlabs/php_codesniffer": "*",
2121
"wp-coding-standards/wpcs": "*",
22-
"yoast/phpunit-polyfills": "^1.0 || ^2.0",
22+
"yoast/phpunit-polyfills": "^4.0.0",
2323
"phpcompatibility/phpcompatibility-wp": "^2.1",
2424
"phpcompatibility/php-compatibility": "^9.3",
2525
"php-parallel-lint/php-parallel-lint": "^1.3",

0 commit comments

Comments
 (0)