Skip to content

dev: use WP_Abilities_Registry::$instance instead of adding a new global #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 19, 2025
Merged

dev: use WP_Abilities_Registry::$instance instead of adding a new global #19

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a909b3f
dev: use `WP_Abilities_Registry::$instance` instead of adding a new `…
justlevine Aug 16, 2025
9604687
Merge branch 'WordPress:trunk' into dev/use-static-registry-instance
justlevine Aug 18, 2025
d401e8c
fix: use PHP7.2 safe syntax
justlevine Aug 18, 2025
737bd1d
tests: use reflection to reset singleton
justlevine Aug 18, 2025
8088fa2
Merge branch 'trunk' into dev/use-static-registry-instance
gziolo Aug 19, 2025
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
18 changes: 12 additions & 6 deletions includes/abilities-api/class-wp-abilities-registry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
* @access private
*/
final class WP_Abilities_Registry {
/**
* The singleton instance of the registry.
*
* @since 0.1.0
* @var ?self
*/
private static ?self $instance = null;

/**
* Holds the registered abilities.
*
Expand Down Expand Up @@ -248,11 +256,9 @@ public function get_registered( string $name ): ?WP_Ability {
* @return \WP_Abilities_Registry The main registry instance.
*/
public static function get_instance(): self {
/** @var \WP_Abilities_Registry $wp_abilities */
global $wp_abilities;
if ( null === self::$instance ) {
self::$instance = new self();

if ( empty( $wp_abilities ) ) {
$wp_abilities = new self();
/**
* Fires when preparing abilities registry.
*
Expand All @@ -263,10 +269,10 @@ public static function get_instance(): self {
*
* @param \WP_Abilities_Registry $instance Abilities registry object.
*/
do_action( 'abilities_api_init', $wp_abilities );
do_action( 'abilities_api_init', self::$instance );
}

return $wp_abilities;
return self::$instance;
}

/**
Expand Down
Loading