Skip to content

Commit de74a0b

Browse files
committed
Attempt to update dependencies
1 parent 253cd14 commit de74a0b

File tree

4 files changed

+25
-27
lines changed

4 files changed

+25
-27
lines changed

.github/workflows/phpunit.yml

+9-20
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,13 @@ jobs:
2424
with:
2525
php-version: ${{ matrix.php-versions }}
2626
coverage: none
27-
tools: composer
27+
tools: composer, phpunit-polyfills
2828
extensions: mysql
29-
- name: Get Composer cache directory
30-
id: composer-cache
31-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
32-
- name: Setup cache
33-
uses: pat-s/[email protected]
34-
with:
35-
path: ${{ steps.composer-cache.outputs.dir }}
36-
# Use the hash of composer.json as the key for your cache if you do not commit composer.lock.
37-
key: ${{ runner.os }}-php-${{ matrix.php-versions }}-composer-${{ hashFiles('**/composer.json') }}
38-
#key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
39-
restore-keys: ${{ runner.os }}-composer-
40-
- name: Install dependencies
41-
run: composer install --prefer-dist --no-progress
42-
- name: Setup Test Environment
43-
run: composer setup-local-tests
44-
- name: Unit Testing
45-
run: composer phpunit
46-
env:
47-
PHP_VERSION: ${{ matrix.php-versions }}
29+
- name: Install Composer dependencies for PHP
30+
uses: "ramsey/composer-install@v1"
31+
- name: Setup Test Environment
32+
run: composer setup-local-tests
33+
- name: Unit Testing
34+
run: composer phpunit
35+
env:
36+
PHP_VERSION: ${{ matrix.php-versions }}

composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
"source": "https://github.com/indieweb/wordpress-indieweb"
2626
},
2727
"require-dev": {
28-
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
29-
"squizlabs/php_codesniffer": "^2.2 || ^3.6",
28+
"dealerdirect/phpcodesniffer-composer-installer": "*",
29+
"squizlabs/php_codesniffer": "*",
3030
"phpcompatibility/php-compatibility": "*",
3131
"wp-coding-standards/wpcs": "*",
3232
"phpcompatibility/phpcompatibility-wp": "*",
3333
"php-parallel-lint/php-parallel-lint": "^1.2",
3434
"wp-cli/i18n-command": "^2.2",
3535
"sebastian/phpcpd": "^3.0 || ^5.0 || ^6.0",
36-
"phpunit/phpunit": "^5.0 || ^6.0 || ^7.5"
36+
"phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.5",
37+
"yoast/phpunit-polyfills": "^1.0"
3738
},
3839
"prefer-stable" : true,
3940
"scripts": {

languages/wordpress-indieweb.pot

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2020 IndieWebCamp WordPress Outreach Club
1+
# Copyright (C) 2022 IndieWebCamp WordPress Outreach Club
22
# This file is distributed under the MIT.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: IndieWeb 3.4.3\n"
5+
"Project-Id-Version: IndieWeb 3.4.4\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpress-indieweb\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"POT-Creation-Date: 2020-08-16T01:20:48+00:00\n"
12+
"POT-Creation-Date: 2022-05-17T02:04:26+00:00\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14-
"X-Generator: WP-CLI 2.4.0\n"
14+
"X-Generator: WP-CLI 2.6.0\n"
1515
"X-Domain: indieweb\n"
1616

1717
#. Plugin Name of the plugin

tests/bootstrap.php

+8
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@
1616
exit( 1 );
1717
}
1818

19+
// Forward custom PHPUnit Polyfills configuration to PHPUnit bootstrap file.
20+
$_phpunit_polyfills_path = getenv( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH' );
21+
if ( false !== $_phpunit_polyfills_path ) {
22+
define( 'WP_TESTS_PHPUNIT_POLYFILLS_PATH', $_phpunit_polyfills_path );
23+
}
24+
1925
// Give access to tests_add_filter() function.
2026
require_once $_tests_dir . '/includes/functions.php';
2127

28+
require_once dirname( dirname( __FILE__ ) ) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
29+
2230
/**
2331
* Manually load the plugin being tested.
2432
*/

0 commit comments

Comments
 (0)