- update Registry to use local Utils and use full namespace for WPGraphQL\Utils\Utils

- normalize location rules to be mapped with strolower

Author: jasonbahl

src/LocationRules/LocationRules.php

@@ -61,7 +61,7 @@ public function __construct( array $acf_field_groups = [] ) {
 	 * @param string $graphql_type_name The name of the GraphQL Type
 	 */
 	public function set_graphql_type( string $field_group_name, string $graphql_type_name ): void {
-		$this->mapped_field_groups[ Utils::format_field_name( $field_group_name, true ) ][] = ucfirst( Utils::format_field_name( $graphql_type_name, true ) );
+		$this->mapped_field_groups[ strtolower( Utils::format_field_name( $field_group_name, true ) ) ][] = ucfirst( Utils::format_field_name( $graphql_type_name, true ) );
 	}
 
 	/**

src/Registry.php

@@ -8,7 +8,6 @@
 use WPGraphQL\Acf\Model\AcfOptionsPage;
 use WPGraphQL\AppContext;
 use WPGraphQL\Registry\TypeRegistry;
-use WPGraphQL\Utils\Utils;
 
 class Registry {
 
@@ -95,7 +94,7 @@ public function has_registered_field_group( string $key ): bool {
 	 * @param array<mixed> $acf_field_group
 	 */
 	public function should_field_group_show_in_graphql( array $acf_field_group ): bool {
-		return \WPGraphQL\Acf\Utils::should_field_group_show_in_graphql( $acf_field_group );
+		return Utils::should_field_group_show_in_graphql( $acf_field_group );
 	}
 
 	/**
@@ -305,7 +304,8 @@ public function get_field_group_interfaces( array $acf_field_group ): array {
 	 * @throws \Exception
 	 */
 	public function register_options_pages(): void {
-		$graphql_options_pages = \WPGraphQL\Acf\Utils::get_acf_options_pages();
+
+		$graphql_options_pages = Utils::get_acf_options_pages();
 
 		if ( empty( $graphql_options_pages ) ) {
 			return;
@@ -361,7 +361,7 @@ public function register_options_pages(): void {
 				]
 			);
 
-			$field_name = Utils::format_field_name( $type_name );
+			$field_name = \WPGraphQL\Utils\Utils::format_field_name( $type_name );
 
 			$interface_name = 'WithAcfOptionsPage' . $type_name;
 
@@ -507,7 +507,7 @@ public function map_acf_field_to_graphql( array $acf_field, array $acf_field_gro
 	 * @throws \GraphQL\Error\Error
 	 */
 	public function get_field_group_name( array $field_group ): string {
-		return \WPGraphQL\Acf\Utils::get_field_group_name( $field_group );
+		return Utils::get_field_group_name( $field_group );
 	}
 
 	/**
@@ -516,7 +516,7 @@ public function get_field_group_name( array $field_group ): string {
 	 * @throws \GraphQL\Error\Error
 	 */
 	public function get_graphql_field_name( array $acf_field ): string {
-		return Utils::format_field_name( $this->get_field_group_name( $acf_field ), true );
+		return \WPGraphQL\Utils\Utils::format_field_name( $this->get_field_group_name( $acf_field ), true );
 	}
 
 	/**
@@ -548,7 +548,7 @@ public function get_field_group_graphql_type_name( array $field_group ): ?string
 			return null;
 		}
 
-		return Utils::format_type_name( $replaced );
+		return \WPGraphQL\Utils\Utils::format_type_name( $replaced );
 	}
 
 	/**
@@ -640,9 +640,14 @@ public function get_graphql_locations_for_field_group( array $field_group, array
 			return $graphql_types;
 		}
 
-		$field_group_name = \WPGraphQL\Acf\Utils::get_field_group_name( $field_group );
+		$field_group_name = Utils::get_field_group_name( $field_group );
+		$field_group_name = \WPGraphQL\Utils\Utils::format_field_name( $field_group_name, true );
+		// The fields are mapped as lowercase strings and should be retrieved as such
+		// see: LocationRules.php
+		$field_group_name = strtolower( $field_group_name );
 
 		$location_rules = $this->get_location_rules( $acf_field_groups );
+
 		if ( isset( $location_rules[ $field_group_name ] ) ) {
 			$graphql_types = $location_rules[ $field_group_name ];
 		}
@@ -679,7 +684,7 @@ public function register_acf_field_groups_to_graphql( array $acf_field_groups =
 			if ( ! empty( $locations ) ) {
 				$with_field_group_interface_name = 'WithAcf' . $type_name;
 
-				$field_name = Utils::format_field_name( $type_name, true );
+				$field_name = \WPGraphQL\Utils\Utils::format_field_name( $type_name, true );
 
 				if ( ! $this->has_registered_field_group( $with_field_group_interface_name ) ) {
 					register_graphql_interface_type(

tests/_support/WPUnit/WPGraphQLAcfTestCase.php

@@ -294,8 +294,6 @@ public function register_acf_field_group( array $acf_field_group = [] ) {
 	 * @return string
 	 */
 	public function register_acf_field( array $acf_field = [], array $acf_field_group = [] ): string {
-
-
 		$field_group_key = $this->register_acf_field_group( $acf_field_group );
 
 		$key =  $acf_field['key'] ?? uniqid( 'field_acf_test_',true );