Skip to content

Commit 00580ff

Browse files
authored
Merge branch 'develop' into filip/delete-redirect-meta
2 parents dd2c408 + eb2cc71 commit 00580ff

9 files changed

Lines changed: 6769 additions & 3116 deletions

File tree

.github/workflows/cs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: CS
33
on:
44
# Run on all relevant pushes (except to main) and on all relevant pull requests.
55
push:
6+
branches:
7+
- main
8+
- develop
9+
- 'release/[0-9]+.[0-9]+*'
10+
- 'hotfix/[0-9]+.[0-9]+*'
611
paths:
712
- '**.php'
813
- 'composer.json'

.github/workflows/phpunit.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Test
33
on:
44
# Run on pushes to select branches and on all pull requests.
55
push:
6+
branches:
7+
- main
8+
- develop
9+
- 'release/[0-9]+.[0-9]+*'
10+
- 'hotfix/[0-9]+.[0-9]+*'
611
pull_request:
712
# Allow manually triggering the workflow.
813
workflow_dispatch:

.github/workflows/playwright.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ env:
1616
on:
1717
push:
1818
branches:
19+
- main
1920
- develop
21+
- 'release/[0-9]+.[0-9]+*'
22+
- 'hotfix/[0-9]+.[0-9]+*'
2023
pull_request:
2124

2225
jobs:

.github/workflows/security.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Security
33
on:
44
# Run on all pushes and on all pull requests.
55
push:
6+
branches:
7+
- main
8+
- develop
9+
- 'release/[0-9]+.[0-9]+*'
10+
- 'hotfix/[0-9]+.[0-9]+*'
611
pull_request:
712
# Also run this workflow every Monday at 6:00.
813
schedule:

.github/workflows/upgrade-compat.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ env:
1616
on:
1717
push:
1818
branches:
19+
- main
1920
- develop
21+
- 'release/[0-9]+.[0-9]+*'
22+
- 'hotfix/[0-9]+.[0-9]+*'
2023
pull_request:
2124
# Allow manually triggering the workflow.
2225
workflow_dispatch:
@@ -135,4 +138,4 @@ jobs:
135138
docker exec $WP_CONTAINER wp plugin activate wordpress-seo-premium --allow-root
136139
137140
# Show plugin settings
138-
docker exec $WP_CONTAINER wp option get progress_planner_settings --allow-root
141+
docker exec $WP_CONTAINER wp option get progress_planner_settings --allow-root

classes/wp-cli/class-task-command.php

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,25 @@ public function get( $args, $assoc_args ) {
124124
}
125125

126126
$format = isset( $assoc_args['format'] ) ? $assoc_args['format'] : 'table';
127-
\WP_CLI\Utils\format_items( $format, [ $task ], \array_keys( $task ) ); // @phpstan-ignore-line
127+
$fields = [ 'task_id', 'provider_id', 'date', 'post_status' ];
128+
129+
$formatted = [];
130+
foreach ( $fields as $field ) {
131+
switch ( $field ) {
132+
case 'task_id':
133+
case 'date':
134+
case 'post_status':
135+
$formatted[ $field ] = $task->$field ?? '';
136+
break;
137+
case 'provider_id':
138+
$formatted[ $field ] = \is_object( $task->provider ?? null ) && isset( $task->provider->name ) ? $task->provider->name : '';
139+
break;
140+
default:
141+
$formatted[ $field ] = $task->$field ?? '';
142+
}
143+
}
144+
145+
\WP_CLI\Utils\format_items( $format, [ $formatted ], $fields ); // @phpstan-ignore-line
128146
}
129147

130148
/**

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"szepeviktor/phpstan-wordpress": "^2.0",
1919
"phpstan/extension-installer": "^1.4",
2020
"yoast/yoastcs": "^3.0",
21-
"friendsofphp/php-cs-fixer": "^3.75"
21+
"friendsofphp/php-cs-fixer": "^3.75",
22+
"wp-cli/wp-cli-bundle": "^2.11"
2223
},
2324
"suggest": {
2425
"ext-pcov": "Recommended for fast code coverage generation (5x faster than Xdebug)",

0 commit comments

Comments
 (0)