Revert "Revert "- update TypeRegistry to bail early if a setting group was not registered.""

jasonbahl · jasonbahl · commit 1e060c250ea4 · 2022-05-16T13:49:50.000-06:00
This reverts commit 3caf65b.
diff --git a/src/Registry/TypeRegistry.php b/src/Registry/TypeRegistry.php
@@ -485,7 +485,7 @@ public function init_type_registry( TypeRegistry $type_registry ) {
 				$group_name = DataSource::format_group_name( $group_name );
 				$type_name  = SettingGroup::register_settings_group( $group_name, $group_name, $this );
 
-				if ( ! $type_name || ! $this->get_type( $type_name ) ) {
+				if ( ! $type_name ) {
 					continue;
 				}
 
diff --git a/src/Type/ObjectType/SettingGroup.php b/src/Type/ObjectType/SettingGroup.php
@@ -30,7 +30,7 @@ public static function register_settings_group( string $group_name, string $grou
 			return null;
 		}
 
-		$type_registry->register_object_type(
+		register_graphql_object_type(
 			ucfirst( $group_name ) . 'Settings',
 			[
 				'description' => sprintf( __( 'The %s setting type', 'wp-graphql' ), $group_name ),

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ public function init_type_registry( TypeRegistry $type_registry ) {`
`485`	`485`	`$group_name = DataSource::format_group_name( $group_name );`
`486`	`486`	`$type_name = SettingGroup::register_settings_group( $group_name, $group_name, $this );`
`487`	`487`
`488`		`- if ( ! $type_name \|\| ! $this->get_type( $type_name ) ) {`
	`488`	`+ if ( ! $type_name ) {`
`489`	`489`	`continue;`
`490`	`490`	`}`
`491`	`491`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public static function register_settings_group( string $group_name, string $grou`
`30`	`30`	`return null;`
`31`	`31`	`}`
`32`	`32`
`33`		`- $type_registry->register_object_type(`
	`33`	`+ register_graphql_object_type(`
`34`	`34`	`ucfirst( $group_name ) . 'Settings',`
`35`	`35`	`[`
`36`	`36`	`'description' => sprintf( __( 'The %s setting type', 'wp-graphql' ), $group_name ),`