Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e130905
Icons: Use snake_case file_path internally in the icon registry.
t-hamano Jun 11, 2026
d08cbfa
Icons: Add APIs for collection and icon registration.
t-hamano Jun 11, 2026
4391d92
Icons: Unhook default icon registration after init in tests.
t-hamano Jun 11, 2026
49c55c7
Icons: Add new icons collection route to schema test.
t-hamano Jun 11, 2026
095efe2
Icons: Regenerate REST API client fixtures.
t-hamano Jun 11, 2026
e1e9b3b
Icons: Validate icon file path before reading content.
t-hamano Jun 13, 2026
0f18d8f
Icons: Allow digits and leading hyphens in collection slugs.
t-hamano Jun 13, 2026
2c5cda5
Icons: Restore @since tags and drop blank line after the opening PHP …
t-hamano Jun 13, 2026
5eb200a
Icons: Require namespaced icon names in the form "collection/icon-name".
t-hamano Jun 15, 2026
c88e154
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jun 22, 2026
42e61b9
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jun 27, 2026
02352b0
Icons: Restore core icons in REST controller tests and unskip them.
t-hamano Jun 27, 2026
510ad27
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jun 29, 2026
73a1267
Icons: Allow digits and underscores in icon slugs.
t-hamano Jun 29, 2026
7cb12a2
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jun 30, 2026
3bf0429
Icons: Add an icon collections REST endpoint and tighten name rules
t-hamano Jun 30, 2026
88f1834
Icons: Use str_contains() for the namespaced icon name check.
t-hamano Jul 7, 2026
8667d72
Icons: Validate that the collection description is a string.
t-hamano Jul 9, 2026
60bb86a
Icons: Update expected REST routes in the schema setup test.
t-hamano Jul 9, 2026
8034efa
Icons: Rename the collection-scoping route param to `collection`.
t-hamano Jul 9, 2026
5f747b3
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jul 9, 2026
02d7ff4
Icons: Regenerate the REST API client fixtures.
t-hamano Jul 11, 2026
1f46db9
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jul 13, 2026
352ed54
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jul 13, 2026
2849457
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jul 14, 2026
ed05836
Merge branch 'trunk' into 64847-icon-api-extend
t-hamano Jul 14, 2026
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
227 changes: 227 additions & 0 deletions src/wp-includes/class-wp-icon-collections-registry.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
<?php
/**
* Icons API: WP_Icon_Collections_Registry class
*
* @package WordPress
* @since 7.1.0
*/

/**
* Core class used for interacting with registered icon collections.
*
* Icons are always associated with a single collection. Collections act as
* a namespace for icons and allow grouping icons coming from different
* sources (e.g. core, Font Awesome, Google Material Icons).
*
* @since 7.1.0
*/
class WP_Icon_Collections_Registry {

/**
* Registered icon collections array.
*
* @since 7.1.0
* @var array[]
*/
protected $registered_collections = array();

/**
* Container for the main instance of the class.
*
* @since 7.1.0
* @var WP_Icon_Collections_Registry|null
*/
protected static $instance = null;

/**
* Registers an icon collection.
*
* @since 7.1.0
*
* @param string $collection_slug Icon collection slug.
* @param array $collection_properties {
* List of properties for the icon collection.
*
* @type string $label Required. A human-readable label for the icon collection.
* @type string $description Optional. A human-readable description for the icon collection.
* }
* @return bool True if the collection was registered successfully, false otherwise.
*/
public function register( $collection_slug, $collection_properties ) {
if ( ! isset( $collection_slug ) || ! is_string( $collection_slug ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection slug must be a string.' ),
'7.1.0'
);
return false;
}

if ( ! preg_match( '/^[a-z0-9]([a-z0-9_-]*[a-z0-9])?$/', $collection_slug ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection slug must start and end with a lowercase letter or digit and contain only lowercase letters, digits, hyphens, and underscores.' ),
'7.1.0'
);
return false;
}

if ( $this->is_registered( $collection_slug ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection is already registered.' ),
'7.1.0'
);
return false;
}

if ( ! is_array( $collection_properties ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection properties must be an array.' ),
'7.1.0'
);
return false;
}

$allowed_keys = array_fill_keys( array( 'label', 'description' ), 1 );
foreach ( array_keys( $collection_properties ) as $key ) {
if ( ! array_key_exists( $key, $allowed_keys ) ) {
_doing_it_wrong(
__METHOD__,
sprintf(
/* translators: %s: The name of a user-provided key. */
__( 'Invalid icon collection property: "%s".' ),
$key
),
'7.1.0'
);
return false;
}
}

if ( ! isset( $collection_properties['label'] ) || ! is_string( $collection_properties['label'] ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection label must be a string.' ),
'7.1.0'
);
return false;
}

if ( isset( $collection_properties['description'] ) && ! is_string( $collection_properties['description'] ) ) {
_doing_it_wrong(
__METHOD__,
__( 'Icon collection description must be a string.' ),
'7.1.0'
);
return false;
}

$defaults = array(
'description' => '',
);
Comment on lines +121 to +123

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.

We're missing type validation for description, no?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nice catch, fixed in 8667d72


$collection = array_merge(
$defaults,
$collection_properties,
array( 'slug' => $collection_slug )
);

$this->registered_collections[ $collection_slug ] = $collection;

return true;
}

/**
* Unregisters an icon collection.
*
* Any icons registered under the given collection are also unregistered.
*
* @since 7.1.0
*
* @param string $collection_slug Icon collection slug.
* @return bool True if the collection was unregistered successfully, false otherwise.
*/
public function unregister( $collection_slug ) {
if ( ! $this->is_registered( $collection_slug ) ) {
_doing_it_wrong(
__METHOD__,
sprintf(
/* translators: %s: Icon collection slug. */
__( 'Icon collection "%s" not found.' ),
$collection_slug
),
'7.1.0'
);
return false;
}

$icons_registry = WP_Icons_Registry::get_instance();
foreach ( $icons_registry->get_registered_icons() as $icon ) {
if ( isset( $icon['collection'] ) && $icon['collection'] === $collection_slug ) {
$icons_registry->unregister( $icon['name'] );
}
}

unset( $this->registered_collections[ $collection_slug ] );

return true;
}

/**
* Retrieves an array containing the properties of a registered icon collection.
*
* @since 7.1.0
*
* @param string $collection_slug Icon collection slug.
* @return array|null Registered collection properties, or `null` if the collection is not registered.
*/
public function get_registered( $collection_slug ) {
if ( ! $this->is_registered( $collection_slug ) ) {
return null;
}

return $this->registered_collections[ $collection_slug ];
}

/**
* Retrieves all registered icon collections.
*
* @since 7.1.0
*
* @return array[] Array of arrays containing the registered icon collections properties.
*/
public function get_all_registered() {
return array_values( $this->registered_collections );
}

/**
* Checks if an icon collection is registered.
*
* @since 7.1.0
*
* @param string|null $collection_slug Icon collection slug.
* @return bool True if the icon collection is registered, false otherwise.
*/
public function is_registered( $collection_slug ) {
return isset( $collection_slug, $this->registered_collections[ $collection_slug ] );
}

/**
* Utility method to retrieve the main instance of the class.
*
* The instance will be created if it does not exist yet.
*
* @since 7.1.0
*
* @return WP_Icon_Collections_Registry The main instance.
*/
public static function get_instance() {
if ( null === self::$instance ) {
self::$instance = new self();
}

return self::$instance;
}
}
Loading
Loading