Skip to content

Commit 7163df9

Browse files
authored
Merge branch 'trunk' into fix/issue-36409-comment-count
2 parents e357266 + 4d83a5b commit 7163df9

7 files changed

Lines changed: 31 additions & 9 deletions

File tree

.github/workflows/test-old-branches.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on:
2525
permissions: {}
2626

2727
env:
28-
CURRENTLY_SUPPORTED_BRANCH: '6.8'
28+
CURRENTLY_SUPPORTED_BRANCH: '6.9'
2929

3030
jobs:
3131
dispatch-workflows-for-old-branches:

.github/workflows/upgrade-develop-testing.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ jobs:
5151
permissions:
5252
contents: read
5353

54-
# Run upgrade tests for the current branch.
54+
# Because the number of jobs spawned can quickly balloon out of control, the following methodology is applied when
55+
# building out the matrix below:
56+
#
57+
# - The two most recent releases of WordPress are always tested.
58+
# - After a branch is created, the pre-release version is also added.
59+
# - The oldest version of WordPress receiving security updates as a courtesy that also runs on a PHP version supported by trunk
60+
# should always be tested.
61+
# - PHP and DB versions are kept to a minimum. In general this should be the highest and lowest supported versions of each with excludes
62+
# being updated to keep the matrix as small as is reasonable.
5563
upgrade-tests-develop:
5664
name: Upgrade from ${{ matrix.wp }}
5765
uses: ./.github/workflows/reusable-upgrade-testing.yml
@@ -67,7 +75,7 @@ jobs:
6775
db-type: [ 'mysql' ]
6876
db-version: [ '5.7', '8.4' ]
6977
# WordPress 5.3 is the oldest version that supports PHP 7.4.
70-
wp: [ '5.3', '6.7', '6.8', '6.9-RC1' ]
78+
wp: [ '5.3', '6.8', '6.9' ]
7179
multisite: [ false, true ]
7280
with:
7381
os: ${{ matrix.os }}
@@ -93,7 +101,7 @@ jobs:
93101
php: [ '7.4', '8.4' ]
94102
db-type: [ 'mysql' ]
95103
db-version: [ '8.4' ]
96-
wp: [ '6.7', '6.8' ]
104+
wp: [ '6.8', '6.9' ]
97105
multisite: [ false, true ]
98106
with:
99107
os: ${{ matrix.os }}

.github/workflows/upgrade-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
7272
db-type: [ 'mysql' ]
7373
db-version: [ '5.7', '8.0', '8.4', '9.6' ]
74-
wp: [ '6.7', '6.8' ]
74+
wp: [ '6.8', '6.9' ]
7575
multisite: [ false, true ]
7676
with:
7777
os: ${{ matrix.os }}

src/wp-admin/css/forms.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ table.form-table td .updated p {
10571057

10581058
.application-password-display input.code {
10591059
margin-bottom: 6px;
1060-
width: 19em;
1060+
width: 20em;
10611061
}
10621062

10631063
.auth-app-card.card {

src/wp-admin/includes/post.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2564,7 +2564,7 @@ function the_block_editor_meta_box_post_form_hidden_fields( $post ) {
25642564
$classic_output = ob_get_clean();
25652565

25662566
$classic_elements = wp_html_split( $classic_output );
2567-
$hidden_inputs = '';
2567+
25682568
foreach ( $classic_elements as $element ) {
25692569
if ( ! str_starts_with( $element, '<input ' ) ) {
25702570
continue;

src/wp-includes/post.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,8 +2599,9 @@ function is_post_embeddable( $post = null ) {
25992599
* @see WP_Query
26002600
* @see WP_Query::parse_query()
26012601
*
2602-
* @param array $args {
2603-
* Optional. Arguments to retrieve posts. See WP_Query::parse_query() for all available arguments.
2602+
* @param array|string $args {
2603+
* Optional. Array or query string of arguments to retrieve posts.
2604+
* See WP_Query::parse_query() for all available arguments.
26042605
*
26052606
* @type int $numberposts Total number of posts to retrieve. Is an alias of `$posts_per_page`
26062607
* in WP_Query. Accepts -1 for all. Default 5.

tests/phpunit/tests/post/getPosts.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,4 +163,17 @@ public function test_explicit_offset_non_0_should_override_paged() {
163163

164164
$this->assertSame( array( $p3 ), $found );
165165
}
166+
167+
/**
168+
* Verifies that get_posts() accepts a query string for the `$args` parameter.
169+
*
170+
* @ticket 64813
171+
*/
172+
public function test_should_accept_query_string_args(): void {
173+
self::factory()->post->create();
174+
$second_post_id = self::factory()->post->create();
175+
$found_post_ids = get_posts( 'numberposts=1&fields=ids' );
176+
177+
$this->assertSame( array( $second_post_id ), $found_post_ids );
178+
}
166179
}

0 commit comments

Comments
 (0)