Merge pull request #67 from wp-graphql/feat/prevent-conflicts-with-old-plugin

fix: prevent conflicts with old plugin

Author: jasonbahl

.github/workflows/testing-integration.yml

@@ -18,21 +18,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.0', '7.4' ]
-        wordpress: [ '6.1', '5.9' ]
+        php: [ '8.1', '8.0' ]
+        wordpress: [ '6.2', '6.1' ]
         acf_pro: [ true, false ]
         acf_version: [ 5.12.4, 6.1.6 ]
         include:
-          - php: '8.1'
-            wordpress: '6.1'
-            acf_pro: true
-            acf_version: '6.1.0-alpha1'
           - php: '8.1'
             wordpress: '6.1'
             acf_pro: true
             coverage: 1
           - php: '8.1'
             wordpress: '5.9'
+          - php: '7.4'
+            wordpress: '6.1'
           - php: '7.3'
             wordpress: '5.9'
       fail-fast: false

access-functions.php

@@ -8,7 +8,7 @@
  */
 function register_graphql_acf_field_type( string $acf_field_type, $config = [] ): void {
 
-	add_action( 'graphql_acf_register_field_types', static function ( \WPGraphQL\Acf\FieldTypeRegistry $registry ) use ( $acf_field_type, $config ) {
+	add_action( 'wpgraphql/acf/register_field_types', static function ( \WPGraphQL\Acf\FieldTypeRegistry $registry ) use ( $acf_field_type, $config ) {
 		$registry->register_field_type( $acf_field_type, $config );
 	} );
 

composer.json

@@ -30,6 +30,7 @@
     "wp-graphql/wp-graphql-testcase": "~2.3",
     "wp-graphql/wp-graphql": "^1.14",
     "phpunit/phpunit": "^9.5",
+    "slevomat/coding-standard": "^8.9",
     "simpod/php-coveralls-mirror": "^3.0",
     "phpstan/extension-installer": "^1.3"
   },

composer.lock

@@ -8,6 +8,13 @@
 	<!-- Check against minimum WP version. -->
 	<config name="minimum_supported_wp_version" value="5.0" />
 
+	<!--
+	Prevent errors caused by WordPress Coding Standards not supporting PHP 8.0+.
+	See: https://github.com/WordPress/WordPress-Coding-Standards/issues/2035
+	See: https://github.com/WordPress/WordPress-Coding-Standards/issues/2035#issuecomment-1325532520
+	-->
+	<ini name="error_reporting" value="E_ALL &#38; ~E_DEPRECATED" />
+
 	<!--
 	Pass some flags to PHPCS:
 	p flag: Show progress of the run.
@@ -41,19 +48,20 @@
 	<exclude-pattern>*/node_modules/*</exclude-pattern>
 	<exclude-pattern>*/vendor/*</exclude-pattern>
 
+	<!-- This defines custom escapting functions, such as ACF escaping functions -->
 	<rule ref="WordPress.Security.EscapeOutput">
-		<properties>
-			<property type="array" name="customAutoEscapedFunctions">
+    	<properties>
+    		<property name="customAutoEscapedFunctions" type="array">
 				<element value="acf_esc_attr"/>
 				<element value="acf_esc_attr_e"/>
 				<element value="acf_esc_attrs"/>
 				<element value="acf_esc_atts"/>
 				<element value="acf_esc_atts_e"/>
 				<element value="acf_esc_html"/>
 				<element value="acf_punctify"/>
-			</property>
-		</properties>
-	</rule>
+    		</property>
+    	</properties>
+    </rule>
 
 	<rule ref="WordPress.WP.I18n">
 		<properties>
@@ -80,6 +88,9 @@
 		<exclude name="PHPCompatibility.Keywords.ForbiddenNamesAsDeclared.objectFound"/>
 		<exclude name="Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure"/>
 
+		<!-- excluded because we are using namespaced hooks, such as "wpgraphql/acf/$action_name" -->
+		<exclude name="WordPress.NamingConventions.ValidHookName.UseUnderscores"/>
+
 		<!-- Should maybe Add Back Later -->
 		<exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket"/>
 		<exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine"/>
@@ -113,4 +124,7 @@
 
 	<!-- Enforce short array syntax -->
 	<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+
+	<!-- Use FQCN for PHPDoc types -->
+	<rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
 </ruleset>

phpcs.ruleset.xml

@@ -7,19 +7,19 @@
 class AcfGraphQLFieldResolver {
 
 	/**
-	 * @var AcfGraphQLFieldType
+	 * @var \WPGraphQL\Acf\AcfGraphQLFieldType
 	 */
 	protected $acf_graphql_field_type;
 
 	/**
-	 * @param AcfGraphQLFieldType $acf_graphql_field_type
+	 * @param \WPGraphQL\Acf\AcfGraphQLFieldType $acf_graphql_field_type
 	 */
 	public function __construct( AcfGraphQLFieldType $acf_graphql_field_type ) {
 		$this->acf_graphql_field_type = $acf_graphql_field_type;
 	}
 
 	/**
-	 * @return AcfGraphQLFieldType
+	 * @return \WPGraphQL\Acf\AcfGraphQLFieldType
 	 */
 	public function get_acf_graphql_field_type(): AcfGraphQLFieldType {
 		return $this->acf_graphql_field_type;