Merge branch 'bug/#16-nested-fields-not-always-showing-up'

# Conflicts:
#	vendor/composer/autoload_static.php

Author: jasonbahl

.env.dist

@@ -0,0 +1,26 @@
+
+# Shared
+TEST_DB_NAME="wptests"
+TEST_DB_HOST="127.0.0.1"
+TEST_DB_USER=""
+TEST_DB_PASSWORD=""
+
+# Install script
+WP_VERSION=latest
+SKIP_DB_CREATE=false
+WP_GRAPHQL_BRANCH=develop
+
+# Codeception
+WP_ROOT_FOLDER="/tmp/wp-graphql-acf/wordpress"
+TEST_SITE_WP_ADMIN_PATH="/wp-admin"
+TEST_SITE_DB_NAME="wptests"
+TEST_SITE_DB_HOST="127.0.0.1"
+TEST_SITE_DB_USER="root"
+TEST_SITE_DB_PASSWORD=""
+TEST_SITE_TABLE_PREFIX="wp_"
+TEST_TABLE_PREFIX="wp_"
+TEST_SITE_WP_URL="http://wp.test"
+TEST_SITE_WP_DOMAIN="wp.test"
+TEST_SITE_ADMIN_EMAIL="[email protected]"
+TEST_SITE_ADMIN_USERNAME="admin"
+TEST_SITE_ADMIN_PASSWORD="password"

src/class-config.php

@@ -527,6 +527,7 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 					]
 				);
 
+
 				$this->add_field_group_fields( $acf_field, $field_type_name );
 
 				$field_config['type'] = $field_type_name;
@@ -572,6 +573,7 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 				break;
 			case 'repeater':
 				$field_type_name = $type_name . '_' . self::camel_case( $acf_field['name'] );
+
 				if ( TypeRegistry::get_type( $field_type_name ) ) {
 					$field_config['type'] = $field_type_name;
 					break;
@@ -701,6 +703,12 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 	 */
 	protected function add_field_group_fields( $field_group, $type_name ) {
 
+		/**
+		 * If the field group has the show_in_graphql setting configured, respect it's setting
+		 * otherwise default to true (for nested fields)
+		 */
+		$field_group['show_in_graphql'] = isset( $field_group['show_in_graphql'] ) ? (boolean) $field_group['show_in_graphql'] : true;
+
 		/**
 		 * Determine if the field group should be exposed
 		 * to graphql
@@ -714,6 +722,7 @@ protected function add_field_group_fields( $field_group, $type_name ) {
 		 */
 		$acf_fields = ! empty( $field_group['sub_fields'] ) ? $field_group['sub_fields'] : acf_get_fields( $field_group );
 
+
 		/**
 		 * If there are no fields, bail
 		 */
@@ -741,6 +750,7 @@ protected function add_field_group_fields( $field_group, $type_name ) {
 				empty( $name ) ||
 				true !== $show_in_graphql
 			) {
+
 				/**
 				 * Uncomment line below to determine what fields are not going to be output
 				 * in the Schema.

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitfe9df9f8c37502263e5983222b50e6db::getLoader();
+return ComposerAutoloaderInit3fbb9843644ca7389b188c6353f475fc::getLoader();

vendor/autoload_commands.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_commands_real.php';
 
-return ComposerAutoloaderInitc774f99474d6b28882a375ec72de544f::getLoader();
+return ComposerAutoloaderInit254943172fc41ccfba4c5a1102355623::getLoader();

vendor/autoload_framework.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_framework_real.php';
 
-return ComposerAutoloaderInit7cf9cedeaf36b791f641c53b21151a3d::getLoader();
+return ComposerAutoloaderInit47d9de09ee078c1c0b939624e29a7c82::getLoader();

vendor/composer/autoload_commands_real.php

@@ -2,7 +2,7 @@
 
 // autoload_commands_real.php @generated by Composer
 
-class ComposerAutoloaderInitc774f99474d6b28882a375ec72de544f
+class ComposerAutoloaderInit254943172fc41ccfba4c5a1102355623
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc774f99474d6b28882a375ec72de544f', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit254943172fc41ccfba4c5a1102355623', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc774f99474d6b28882a375ec72de544f', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit254943172fc41ccfba4c5a1102355623', 'loadClassLoader'));
 
         $classMap = require __DIR__ . '/autoload_commands_classmap.php';
         if ($classMap) {

vendor/composer/autoload_framework_real.php

@@ -2,7 +2,7 @@
 
 // autoload_framework_real.php @generated by Composer
 
-class ComposerAutoloaderInit7cf9cedeaf36b791f641c53b21151a3d
+class ComposerAutoloaderInit47d9de09ee078c1c0b939624e29a7c82
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit7cf9cedeaf36b791f641c53b21151a3d', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit47d9de09ee078c1c0b939624e29a7c82', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit7cf9cedeaf36b791f641c53b21151a3d', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit47d9de09ee078c1c0b939624e29a7c82', 'loadClassLoader'));
 
         $classMap = require __DIR__ . '/autoload_framework_classmap.php';
         if ($classMap) {

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitfe9df9f8c37502263e5983222b50e6db
+class ComposerAutoloaderInit3fbb9843644ca7389b188c6353f475fc
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitfe9df9f8c37502263e5983222b50e6db', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3fbb9843644ca7389b188c6353f475fc', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitfe9df9f8c37502263e5983222b50e6db', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3fbb9843644ca7389b188c6353f475fc', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitfe9df9f8c37502263e5983222b50e6db::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit3fbb9843644ca7389b188c6353f475fc::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitfe9df9f8c37502263e5983222b50e6db
+class ComposerStaticInit3fbb9843644ca7389b188c6353f475fc
 {
     public static $prefixLengthsPsr4 = array (
         'W' => 
@@ -29,9 +29,9 @@ class ComposerStaticInitfe9df9f8c37502263e5983222b50e6db
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitfe9df9f8c37502263e5983222b50e6db::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitfe9df9f8c37502263e5983222b50e6db::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitfe9df9f8c37502263e5983222b50e6db::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit3fbb9843644ca7389b188c6353f475fc::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit3fbb9843644ca7389b188c6353f475fc::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit3fbb9843644ca7389b188c6353f475fc::$classMap;
 
         }, null, ClassLoader::class);
     }