- phpcs

- remove WordPress 5.9 from testing matrix

Author: jasonbahl

.github/workflows/testing-integration.yml

@@ -33,12 +33,8 @@ jobs:
             acf_pro: true
             wpgraphql_content_blocks: true
             coverage: 1
-          - php: '8.1'
-            wordpress: '5.9'
           - php: '7.4'
             wordpress: '6.1'
-          - php: '7.3'
-            wordpress: '5.9'
       fail-fast: false
     name: WordPress ${{ matrix.wordpress }}, PHP ${{ matrix.php }}, ACF ${{matrix.acf_version}}, ACF & ACF EXTENDED PRO ${{matrix.acf_pro}}, WPGRAPHQL Content Blocks ${{matrix.wpgraphql_content_blocks}}
     steps:

src/AcfGraphQLFieldType.php

@@ -166,9 +166,11 @@ public function get_admin_field_settings( array $field, Settings $settings ) {
 		// Get the admin fields for the field type
 		$admin_fields = $this->get_admin_fields( $field, $default_admin_settings, $settings );
 
+		$excluded_admin_fields = $this->get_config( 'exclude_admin_fields' );
+
 		// Remove excluded fields
-		if ( isset( $this->config['exclude_admin_fields'] ) && is_array( $this->config['exclude_admin_fields'] ) ) {
-			foreach ( $this->config['exclude_admin_fields'] as $excluded ) {
+		if ( is_array( $excluded_admin_fields ) ) {
+			foreach ( $excluded_admin_fields as $excluded ) {
 				unset( $admin_fields[ $excluded ] );
 			}
 		}