Merge pull request #39 from jenkoian/default-label

Add default label for register_flag too.
jamesrwilliams · Apr 22, 2021 · 95b8a16 · 95b8a16
2 parents 1a32610 + 1d47f78
commit 95b8a16
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/includes/api/api.general.php b/includes/api/api.general.php
@@ -8,6 +8,7 @@
  * @package flagpole
  */
 
+use Flagpole\Flag;
 use Flagpole\Flagpole;
 
 /**
@@ -23,6 +24,7 @@ function flagpole_register_flag( $args ) {
 		'enforced'    => false,
 		'description' => '',
 		'stable'      => false,
+		'label'       => Flag::DEFAULT_LABEL
 
 	];
 

diff --git a/includes/class-flag.php b/includes/class-flag.php
@@ -20,6 +20,10 @@
  * @package FeatureFlag
  */
 class Flag {
+	/**
+	 * Default label for flags without a label to be grouped under.
+	 */
+	const DEFAULT_LABEL = 'All';
 
 	/**
 	 * Flags can be enforced. When they are they bypass
@@ -89,11 +93,11 @@ class Flag {
 	 */
 	public function __construct( $_key, $_name, $_enforced, $_description, $_stable, $_label ) {
 		$this->enforced    = $_enforced;
-		$this->name        = ( $_name ? $_name : '' );
+		$this->name        = $_name ?: '';
 		$this->key         = $_key;
 		$this->description = $_description;
 		$this->stable      = $_stable;
-		$this->label       = ( $_label ? $_label : 'All' );
+		$this->label       = $_label ?: self::DEFAULT_LABEL;
 	}
 
 	/**