Skip to content

Commit

Permalink
Merge branch 'master' into add-placehold
Browse files Browse the repository at this point in the history
  • Loading branch information
crstauf committed Feb 7, 2024
2 parents 5bbe15a + 4eee1da commit 6f549bf
Show file tree
Hide file tree
Showing 12 changed files with 603 additions and 1,494 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ on:
branches:
- master
paths:
- composer.json
- composer.lock
- Plugin.php
- includes/**
- .github/workflows/phpcs.yml
pull_request:
paths:
- composer.json
- composer.lock
- Plugin.php
- includes/**
- .github/workflows/phpcs.yml
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ on:
branches:
- master
paths:
- composer.json
- composer.lock
- Plugin.php
- includes/**
- .github/workflows/phpstan.yml
pull_request:
paths:
- composer.json
- composer.lock
- Plugin.php
- includes/**
- .github/workflows/phpstan.yml
Expand Down
81 changes: 0 additions & 81 deletions .github/workflows/phpunit.yml

This file was deleted.

58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

155 changes: 0 additions & 155 deletions bin/install-wp-tests.sh

This file was deleted.

18 changes: 8 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"require-dev": {
"yoast/phpunit-polyfills": "^1.0",
"yoast/phpunit-polyfills": "^2.0",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
"automattic/vipwpcs": "^2.3",
"phpunit/phpunit": "^9",
"assertwell/wp-core-test-framework": "^0.2.0",
"phpstan/phpstan": "^1.6",
"php-stubs/wordpress-stubs": "^5.9",
"szepeviktor/phpstan-wordpress": "^1.1",
"phpstan/extension-installer": "^1.1",
"php-stubs/acf-pro-stubs": "^5.12"
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"automattic/vipwpcs": "^3.0",
"phpstan/phpstan": "^1.10.57",
"php-stubs/wordpress-stubs": "^6.4.1",
"szepeviktor/phpstan-wordpress": "^1.3.2",
"phpstan/extension-installer": "^1.3.1",
"php-stubs/acf-pro-stubs": "^6.1.7"
},
"config": {
"allow-plugins": {
Expand Down
Loading

0 comments on commit 6f549bf

Please sign in to comment.