Add when() helper to make conditional effects smaller

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 .php_cs.cache
 .phpunit.result.cache
 .php-cs-fixer.cache
+.vscode

CHANGELOG.md

@@ -4,7 +4,9 @@ This library adheres to [Semantic Versioning](https://semver.org/) and [Keep a C
 
 ## Unreleased
 
-Nothing yet.
+### Added
+
+- Added `when()` method to `Group` class to conditionally include features without using `Effect`.
 
 ## 3.0.0
 

docs/features.md

@@ -92,6 +92,23 @@ $plugin->include(
   ),
 );
 
+// This can also be written using the when() helper.
+$plugin->when(
+  when: fn () => get_current_blog_id() !== 1,
+  then: fn () => new Ordered(
+      first: new Library\Plugin_Loader(
+        plugins: [
+          'block-visibility/block-visibility.php',
+        ],
+      ),
+      then: new Group(
+        new Features\Block_Visibility_Settings(),
+        new Features\Block_Visibility_Custom_Conditions(),
+      ),
+    ),
+  ),
+);
+
 // Load the Google Tag Manager script on templates.
 $plugin->include(
   new Template_Feature(

src/features/class-effect.php

@@ -16,18 +16,18 @@ final class Effect implements Feature {
 	/**
 	 * The condition to check.
 	 *
-	 * @var callable
+	 * @var bool|callable
 	 */
 	private $when;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param callable $when The condition to check.
-	 * @param Feature  $then The feature to boot if the condition is met.
+	 * @param bool|callable $when The condition to check.
+	 * @param Feature       $then The feature to boot if the condition is met.
 	 */
 	public function __construct(
-		callable $when,
+		bool|callable $when,
 		private readonly Feature $then,
 	) {
 		$this->when = $when;
@@ -37,7 +37,9 @@ public function __construct(
 	 * Boot the feature.
 	 */
 	public function boot(): void {
-		if ( ( $this->when )() === true ) {
+		if ( is_callable( $this->when ) && ( $this->when )() === true ) {
+			$this->then->boot();
+		} elseif ( is_bool( $this->when ) && true === $this->when ) {
 			$this->then->boot();
 		}
 	}

src/features/class-group.php

@@ -47,4 +47,15 @@ public function boot(): void {
 	public function include( Feature ...$features ): void {
 		array_push( $this->features, ...$features );
 	}
+
+	/**
+	 * Include a conditional feature.
+	 *
+	 * @param bool|callable $when The condition to check.
+	 * @param Feature       $then The feature to boot if the condition is met.
+	 * @return void
+	 */
+	public function when( bool|callable $when, Feature $then ): void {
+		$this->include( new Effect( $when, $then ) );
+	}
 }

tests/Feature/Features/GroupTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * GroupTest class file.
+ *
+ * @package wp-type-extensions
+ *
+ * phpcs:disable Squiz.PHP.DisallowMultipleAssignments.Found, WordPress.Security.ValidatedSanitizedInput
+ */
+
+namespace Alley\WP\Tests\Feature\Features;
+
+use Mantle\Testkit\Test_Case;
+use Alley\WP\Features\Group;
+use Alley\WP\Features\Quick_Feature;
+use Alley\WP\Types\Feature;
+
+/**
+ * Tests for Group class.
+ */
+class GroupTest extends Test_Case {
+	/**
+	 * Test that group can boot a set of features.
+	 */
+	public function test_it_can_boot_a_group_of_features(): void {
+		$_SERVER['booted_quick_feature']   = false;
+		$_SERVER['booted_feature']         = false;
+		$_SERVER['booted_group_of_groups'] = false;
+		$_SERVER['included_feature']       = false;
+
+		$group = new Group(
+			new Quick_Feature( fn () => $_SERVER['booted_quick_feature'] = true ),
+			new class() implements Feature {
+				/**
+				 * Boot the feature.
+				 */
+				public function boot(): void {
+					$_SERVER['booted_feature'] = true;
+				}
+			},
+			new Group(
+				new Quick_Feature( fn () => $_SERVER['booted_group_of_groups'] = true ),
+			),
+		);
+
+		$group->include(
+			new Quick_Feature( fn () => $_SERVER['included_feature'] = true ),
+		);
+
+		$group->boot();
+
+		$this->assertTrue( $_SERVER['booted_feature'] );
+		$this->assertTrue( $_SERVER['booted_quick_feature'] );
+		$this->assertTrue( $_SERVER['booted_group_of_groups'] );
+		$this->assertTrue( $_SERVER['included_feature'] );
+	}
+}