Skip to content

Commit

Permalink
Merge branch 'main' into fix/13703-bump-wp-min-ver-6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
swissspidy committed Jun 25, 2024
2 parents 334443b + 16cc8f0 commit 26321cb
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 26 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"ext-mbstring": "*",
"ampproject/amp-toolbox": "*",
"ampproject/amp-wp": "dev-develop",
"enshrined/svg-sanitize": "^0.18.0",
"enshrined/svg-sanitize": "^0.19.0",
"mcaskill/composer-exclude-files": "^4.0",
"symfony/polyfill-mbstring": "^1.18"
},
Expand All @@ -22,7 +22,7 @@
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"ergebnis/composer-normalize": "^2.28",
"humbug/php-scoper": "^0.17.5",
"php-stubs/woocommerce-stubs": "^8.0",
"php-stubs/woocommerce-stubs": "^9.0",
"php-stubs/wordpress-tests-stubs": "^6.1.1",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"phpmd/phpmd": "^2.9",
Expand Down
48 changes: 25 additions & 23 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/phpunit/integration/tests/Media/Types.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function test_get_allowed_mime_types_multisite(): void {
}

// See https://core.trac.wordpress.org/ticket/53167.
if ( version_compare( get_bloginfo( 'version' ), '6.5', '>' ) ) {
if ( is_wp_version_compatible( '6.6' ) ) {
$expected['audio'] = [
'audio/mpeg',
'audio/aac',
Expand Down

0 comments on commit 26321cb

Please sign in to comment.