Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into update/local-transla…
Browse files Browse the repository at this point in the history
…tions
  • Loading branch information
d-alleyne committed Mar 7, 2025
2 parents a0adc2d + ee422b5 commit 885630c
Show file tree
Hide file tree
Showing 116 changed files with 2,655 additions and 400 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/update-phan-stubs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,15 @@ jobs:
- name: Create commit and PR
if: steps.changes.outputs.needed == 'true' && steps.changes.outputs.has-branch == 'false'
env:
GH_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
GH_TOKEN: ${{ secrets.STUB_UPDATE_TOKEN_GITHUB }}
run: |
git checkout -b update/phan-custom-stubs
git commit -am 'phan: Update custom stubs'
git push origin HEAD
gh pr create --title 'phan: Update custom stubs' --body 'This is an automatic update generated by a GitHub Action. If closed it will be recreated the next time the action runs.' --label '[Pri] Normal' --label '[Type] Janitorial' --label '[Status] Needs Review' --reviewer Automattic/jetpack-garage
git push origin update/phan-custom-stubs
if ! gh pr create --title 'phan: Update custom stubs' --body 'This is an automatic update generated by a GitHub Action. If closed it will be recreated the next time the action runs.' --label '[Pri] Normal' --label '[Type] Janitorial' --label '[Status] Needs Review' --reviewer Automattic/jetpack-garage; then
git push --delete origin update/phan-custom-stubs
exit 1
fi
- name: Update existing branch
if: steps.changes.outputs.needed == 'true' && steps.changes.outputs.has-branch == 'true'
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/akismet-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from Akismet 5.3.6
* Stubs automatically generated from Akismet 5.3.7
* using the definition file `tools/stubs/akismet-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/amp-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from AMP 2.5.5 and AMP for WP 1.1.2
* Stubs automatically generated from AMP 2.5.5 and AMP for WP 1.1.3
* using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/gutenberg-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from Gutenberg 20.2.0
* Stubs automatically generated from Gutenberg 20.4.0
* using the definition file `tools/stubs/gutenberg-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-internal-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooCommerce 9.6.1
* Stubs automatically generated from WooCommerce 9.7.1
* using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-payments-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooPayments 8.9.0
* Stubs automatically generated from WooPayments 9.0.0
* using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
18 changes: 16 additions & 2 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 8424db9d619258e881e7ae9d91a8ff20af5e3a38.
* Stubs automatically generated from WordPress.com commit 311fc0d0b8034a506d58c9e385abfcfdf5e81614.
*/

namespace {
Expand Down Expand Up @@ -421,7 +421,12 @@ public static function get_product_list($_blog_id, $type = \null, ?bool $is_edit
}
class Memberships_Store_Sandbox
{
public function init($force = \false)
/**
* @param bool $force
* @param int|null $blog_id
* @return void
*/
public function init($force = \false, ?int $blog_id = \null)
{
}
/**
Expand Down Expand Up @@ -885,6 +890,15 @@ function wpcom_enhanced_excerpt_extract_excerpt($args)
function add_jetpack_submenu()
{
}
class Jetpack_Server_Version
{
/**
* @return bool|WP_Error|object
*/
static function get_token_from_authorization_header()
{
}
}
class Jetpack_Sync_WPCOM_Shadow_Replicastore extends \Automattic\Jetpack\Sync\Replicastore
{
}
Expand Down
130 changes: 112 additions & 18 deletions pnpm-lock.yaml

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

Loading

0 comments on commit 885630c

Please sign in to comment.