Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .agents/skills/ship-wp-ability/references/class-skeleton.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ Path: `projects/plugins/jetpack/src/abilities/class-<name>-abilities.php`
* @package automattic/jetpack
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9; suppressions needed for older-WP compatibility runs.

namespace Automattic\Jetpack\Plugin\Abilities;

use Automattic\Jetpack\WP_Abilities\Registrar;
Expand Down Expand Up @@ -321,8 +319,6 @@ Only two things change from the plugin template:
* @package automattic/jetpack-<pkg>
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Ability API added in WP 6.9.

namespace Automattic\Jetpack\<Pkg>\Abilities;

use Automattic\Jetpack\WP_Abilities\Registrar;
Expand Down
2 changes: 0 additions & 2 deletions .agents/skills/ship-wp-ability/references/test-templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Uses `WP_UnitTestCase` with full WP test environment available. Can create users
* @package automattic/jetpack
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9.

use Automattic\Jetpack\Plugin\Abilities\<Name>_Abilities;
use Automattic\Jetpack\WP_Abilities\Registrar;
use PHPUnit\Framework\Attributes\CoversClass;
Expand Down
2 changes: 1 addition & 1 deletion .phpcs.config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- This file configures everything except the list of rules. -->
<!-- The separation is so .github/files/phpcompatibility-dev-phpcs.xml can use the same config with a different rule set. -->
<ruleset>
<config name="minimum_supported_wp_version" value="6.8" />
<config name="minimum_supported_wp_version" value="6.9" />
<config name="testVersion" value="7.2-"/>

<!-- Use our custom filter for `.phpcsignore` and `.phpcs.dir.xml` support. -->
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"phan/phan": "5.5.2",
"php-parallel-lint/php-parallel-lint": "^1.4.0",
"php-stubs/woocommerce-stubs": ">=7.0",
"php-stubs/wordpress-stubs": ">=6.8",
"php-stubs/wordpress-tests-stubs": ">=6.8",
"php-stubs/wordpress-stubs": ">=6.9",
"php-stubs/wordpress-tests-stubs": ">=6.9",
"php-stubs/wp-cli-stubs": "^2.10",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"sirbrillig/phpcs-changed": "^2.11.5",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

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

10 changes: 9 additions & 1 deletion projects/packages/backup/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,12 @@
// Require base config.
require __DIR__ . '/../../../../.phan/config.base.php';

return make_phan_config( dirname( __DIR__ ), array( '+stubs' => array( 'woocommerce-internal' ) ) );
return make_phan_config(
dirname( __DIR__ ),
array(
'+stubs' => array( 'woocommerce-internal' ),
'exclude_file_regex' => array(
'build/',
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I had this on my list to update four projects.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like five now with premium-analytics. But you got them. 🎉

),
)
);
5 changes: 5 additions & 0 deletions projects/packages/backup/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


5 changes: 5 additions & 0 deletions projects/packages/backup/changelog/update-min-wp-to-6.9#2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Exclude wp-build "build" dir from Phan. It's confusing when running CI (where it doesn't exist) versus locally (where it might).


Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
* @package automattic/jetpack-backup
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9; suppressions for older-WP compatibility runs.

namespace Automattic\Jetpack\Backup\V0005\Abilities;

use Automattic\Jetpack\Backup\V0005\Jetpack_Backup;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* @package automattic/jetpack-backup
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9.

namespace Automattic\Jetpack\Backup\V0005\Abilities;

use PHPUnit\Framework\Attributes\CoversClass;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ public function get_menus( $args = array() ) {
);
$args['taxonomy'] = self::MENU_TAX;

$terms = get_terms( $args ); // @phan-suppress-current-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
$terms = get_terms( $args );
if ( ! $terms || is_wp_error( $terms ) ) {
return array();
}
Expand Down
2 changes: 1 addition & 1 deletion projects/packages/codesniffer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ You should then include the Jetpack rules in your `.phpcs.xml.dist`, like
```
You will also likely want to set some configuration for other included rulesets:
```xml
<config name="minimum_supported_wp_version" value="6.8" />
<config name="minimum_supported_wp_version" value="6.9" />
<config name="testVersion" value="7.2-"/>
```

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

Bump `minimum_supported_wp_version` in README to 6.9.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ruleset>

<config name="minimum_supported_wp_version" value="6.8" />
<config name="minimum_supported_wp_version" value="6.9" />
<config name="testVersion" value="7.2-"/>

<!-- Ruleset under test. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ruleset>

<config name="minimum_supported_wp_version" value="6.8" />
<config name="minimum_supported_wp_version" value="6.9" />
<config name="testVersion" value="7.2-"/>

<!-- Ruleset under test. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<ruleset>

<config name="minimum_supported_wp_version" value="6.8" />
<config name="minimum_supported_wp_version" value="6.9" />
<config name="testVersion" value="7.2-"/>

<!-- Ruleset under test. -->
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/forms/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
* @since 1.0.0
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Ability API added in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this line when we drop WP <6.9.

namespace Automattic\Jetpack\Forms\Abilities;

use Automattic\Jetpack\WP_Abilities\Registrar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
* @phan-file-suppress PhanPluginDuplicateAdjacentStatement -- Intentional for idempotency test
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Ability API added in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this line when we drop WP <6.9.

namespace Automattic\Jetpack\Forms\Abilities;

use Automattic\Jetpack\Forms\ContactForm\Contact_Form;
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/import/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


1 change: 0 additions & 1 deletion projects/packages/import/src/endpoints/class-post.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ function ( $key ) {
* @return array Array of term IDs.
*/
protected function get_term_ids_from_slugs( $term_slugs, $taxonomy_name ) {
// @phan-suppress-next-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
return get_terms(
array(
'fields' => 'ids',
Expand Down
9 changes: 8 additions & 1 deletion projects/packages/newsletter/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@
// Require base config.
require __DIR__ . '/../../../../.phan/config.base.php';

return make_phan_config( dirname( __DIR__ ) );
return make_phan_config(
dirname( __DIR__ ),
array(
'exclude_file_regex' => array(
'build/',
),
)
);
5 changes: 5 additions & 0 deletions projects/packages/newsletter/changelog/update-min-wp-to-6.9#2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Exclude wp-build "build" dir from Phan. It's confusing when running CI (where it doesn't exist) versus locally (where it might).


5 changes: 4 additions & 1 deletion projects/packages/podcast/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
return make_phan_config(
dirname( __DIR__ ),
array(
'+stubs' => array( 'wpcom' ),
'+stubs' => array( 'wpcom' ),
'exclude_file_regex' => array(
'build/',
),
)
);
5 changes: 5 additions & 0 deletions projects/packages/podcast/changelog/update-min-wp-to-6.9#2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Exclude wp-build "build" dir from Phan. It's confusing when running CI (where it doesn't exist) versus locally (where it might).


9 changes: 8 additions & 1 deletion projects/packages/premium-analytics/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@
// Require base config.
require __DIR__ . '/../../../../.phan/config.base.php';

return make_phan_config( dirname( __DIR__ ) );
return make_phan_config(
dirname( __DIR__ ),
array(
'exclude_file_regex' => array(
'build/',
),
)
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Exclude wp-build "build" dir from Phan. It's confusing when running CI (where it doesn't exist) versus locally (where it might).


9 changes: 8 additions & 1 deletion projects/packages/scan/.phan/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,11 @@
// Require base config.
require __DIR__ . '/../../../../.phan/config.base.php';

return make_phan_config( dirname( __DIR__ ) );
return make_phan_config(
dirname( __DIR__ ),
array(
'exclude_file_regex' => array(
'build/',
),
)
);
5 changes: 5 additions & 0 deletions projects/packages/scan/changelog/update-min-wp-to-6.9#2
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Exclude wp-build "build" dir from Phan. It's confusing when running CI (where it doesn't exist) versus locally (where it might).


5 changes: 5 additions & 0 deletions projects/packages/search/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,6 @@ public static function backfill( string $mode = 'mirror' ): int {
// with no orphans. Map keys are user-side slugs, never slot slugs,
// so the inner `delete_term` fires don't recurse.
if ( 'rebuild' === $mode ) {
// @phan-suppress-next-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
$existing_slot_terms = get_terms(
array(
'taxonomy' => $slot,
Expand All @@ -355,7 +354,6 @@ public static function backfill( string $mode = 'mirror' ): int {
}
}
}
// @phan-suppress-next-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
$terms = get_terms(
array(
'taxonomy' => $user_slug,
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/stats/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
* @package automattic/jetpack-stats
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9; suppressions needed for older-WP compatibility runs.

namespace Automattic\Jetpack\Stats\Abilities;

use Automattic\Jetpack\Stats\Options;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* @package automattic/jetpack-stats
*/

// @phan-file-suppress PhanUndeclaredFunction, PhanUndeclaredClassMethod @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9.

namespace Automattic\Jetpack\Stats\Abilities;

use Automattic\Jetpack\Stats\Main;
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/sync/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


1 change: 0 additions & 1 deletion projects/packages/sync/src/class-replicastore.php
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,6 @@ public function get_terms( $taxonomy ) {
if ( ! $t || is_wp_error( $t ) ) {
return $t;
}
// @phan-suppress-next-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
return get_terms( $taxonomy );
}

Expand Down
1 change: 0 additions & 1 deletion projects/packages/sync/src/modules/class-terms.php
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,6 @@ public function expand_term_taxonomy_id( $args ) {
list( $term_taxonomy_ids, $previous_end ) = $args;

return array(
// @phan-suppress-next-line PhanAccessMethodInternal @phan-suppress-current-line UnusedSuppression -- Fixed in WP 6.9, but then we need a suppression for the WP 6.8 compat run. @todo Remove this suppression when we drop WP <6.9.
'terms' => get_terms(
array(
'hide_empty' => false,
Expand Down
5 changes: 5 additions & 0 deletions projects/packages/wp-abilities/changelog/update-min-wp-to-6.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Clean up obsolete phan suppressions now that we dropped WP 6.8


1 change: 0 additions & 1 deletion projects/packages/wp-abilities/src/class-registrar.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
* @package automattic/jetpack-wp-abilities
*/

// @phan-file-suppress PhanUndeclaredFunction @phan-suppress-current-line UnusedSuppression -- Abilities API added in WP 6.9. We guard with function_exists() checks so the package is safe on older WP. @todo Remove this line when the minimum supported WordPress version is 6.9.
// @phan-file-suppress PhanAbstractStaticMethodCallInStatic -- static:: dispatches to the concrete subclass for the three abstract getters; callers must not instantiate Registrar itself.

namespace Automattic\Jetpack\WP_Abilities;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: changed
Comment: Bump wp_version in tests.


Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public function test_register_scripts_skips_wp_theme_when_already_registered() {
* Test that wp-notices is force-replaced on WP < 7.0.
*/
public function test_register_scripts_force_replaces_wp_notices_on_old_wp() {
$GLOBALS['wp_version'] = '6.8';
$GLOBALS['wp_version'] = '6.9';
$this->create_asset_file( 'scripts/notices/index.asset.php', array(), '9.9.9' );

$scripts = $this->create_clean_scripts();
Expand All @@ -332,7 +332,7 @@ public function test_register_scripts_force_replaces_wp_notices_on_old_wp() {
* Test that wp-private-apis is force-replaced on WP < 7.0.
*/
public function test_register_scripts_force_replaces_wp_private_apis_on_old_wp() {
$GLOBALS['wp_version'] = '6.8';
$GLOBALS['wp_version'] = '6.9';
$this->create_asset_file( 'scripts/private-apis/index.asset.php', array(), '9.9.9' );

$scripts = $this->create_clean_scripts();
Expand Down Expand Up @@ -370,7 +370,7 @@ public function test_register_scripts_does_not_force_replace_on_wp_7() {
* Test that force scripts register fine even when not pre-existing.
*/
public function test_register_scripts_force_registers_fresh_on_old_wp() {
$GLOBALS['wp_version'] = '6.8';
$GLOBALS['wp_version'] = '6.9';
$this->create_asset_file( 'scripts/notices/index.asset.php', array(), '9.9.9' );
$this->create_asset_file( 'scripts/private-apis/index.asset.php', array(), '8.8.8' );

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: major
Type: changed

General: Update minimum WordPress version to 6.9.
2 changes: 1 addition & 1 deletion projects/plugins/automattic-for-agencies-client/readme.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
=== Automattic For Agencies Client ===
Contributors: automattic, jeherve, njweller, rcanepa
Tags: agency, dashboard, management, sites, monitoring
Requires at least: 6.8
Requires at least: 6.9
Requires PHP: 7.2
Tested up to: 7.0
Stable tag: 0.8.0
Expand Down
Loading
Loading