Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into add/foundation-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
haqadn committed Oct 27, 2024
2 parents 46f1d79 + 0859d95 commit bc0fd52
Show file tree
Hide file tree
Showing 256 changed files with 1,566 additions and 1,165 deletions.
2 changes: 1 addition & 1 deletion .github/versions.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Versions of tools to use in CI.
PHP_VERSION=8.2
COMPOSER_VERSION=2.7.7
NODE_VERSION=20.8.1
NODE_VERSION=22.9.0
PNPM_VERSION=9.3.0

# Other useful version numbers.
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.8.1
22.9.0
8 changes: 4 additions & 4 deletions .phan/stubs/wpcom-stubs.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* `bin/teamcity-builds/jetpack-stubs/stub-defs.php` and regenerate the stubs
* by triggering the Jetpack Staging → Update WPCOM Stubs job in TeamCity.
*
* Stubs automatically generated from WordPress.com commit 2ed424b4493f3450b67bb248706d6e29170e6042.
* Stubs automatically generated from WordPress.com commit 4fd96546151f08483e92c0807b89830093fc1aee.
*/

namespace {
Expand Down Expand Up @@ -548,7 +548,7 @@ function is_automattic($blog_id = \null)
{
}
/**
* @param int|null $blog_id
* @param int|string|null $blog_id
* @return bool
*/
function wpcom_is_automattic_p2_site($blog_id = \null)
Expand Down Expand Up @@ -716,7 +716,7 @@ function is_simple_site_redirect($blog_id = 0)
}
class Subscription_Mailer extends \WordPressMailer
{
public function __construct(\Blog_Subscriber $subscriber, $use_wp = \true)
public function __construct(\Blog_Subscriber $subscriber, $use_wp = \true, $locale_type = self::USER_LOCALE)
{
}
/**
Expand Down Expand Up @@ -1058,7 +1058,7 @@ function wpcom_fetch_subs_counts($include_paid_subscribers = \false)
function wpcom_is_child_theme()
{
}
function queue_publish_post($post_id, $post = \null)
function queue_publish_post($post_id, $post = \null, $old_post_status = \null)
{
}
/**
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"version-packages": "bash ./tools/version-packages.sh"
},
"devDependencies": {
"eslint": "8.57.0",
"eslint": "8.57.1",
"husky": "8.0.3",
"jetpack-cli": "workspace:*",
"jetpack-js-tools": "workspace:*"
},
"engines": {
"node": "^20.8.1",
"pnpm": "^9.3.0"
"node": "^22.9.0",
"pnpm": "^9.3.0 <9.12.0"
}
}
Loading

0 comments on commit bc0fd52

Please sign in to comment.