AxeWP · justlevine · Apr 6, 2024 · Apr 6, 2024 · Apr 6, 2024 · Apr 6, 2024
diff --git a/README.md b/README.md
@@ -99,7 +99,6 @@ composer require axewp/wp-graphql-plugin-boilerplate
 },
 ```
 
-
 ### As a plugin starter
 
 #### 1. Initialize the plugin

diff --git a/composer.json b/composer.json
@@ -14,13 +14,14 @@
 		}
 	],
 	"require": {
-		"php": ">=7.4 || ^8.0 || ^8.1"
+		"php": ">=7.4"
 	},
 	"require-dev": {
 		"phpstan/extension-installer": "^1.1",
 		"phpstan/phpstan": "^1.2",
 		"axepress/wp-graphql-stubs": "^1.12.2",
-		"axepress/wp-graphql-cs": "^1.0.0-beta",
+		"axepress/wp-graphql-cs": "^2.0.0-beta",
+		"phpcompatibility/php-compatibility": "dev-develop as 9.9.9",
 		"szepeviktor/phpstan-wordpress": "^1.0",
 		"wp-cli/wp-cli-bundle": "^2.8.1"
 	},

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,7 +1,20 @@
 parameters:
 		level: 8
+		checkAlwaysTrueCheckTypeFunctionCall: true
+		checkAlwaysTrueInstanceof: true
+		checkAlwaysTrueStrictComparison: true
+		checkExplicitMixedMissingReturn: true
+		checkFunctionNameCase: true
+		checkInternalClassCaseSensitivity: true
+		checkMissingIterableValueType: true
+		checkTooWideReturnTypesInProtectedAndPublicMethods: true
 		inferPrivatePropertyTypeFromConstructor: true
-		checkMissingIterableValueType: false
+		polluteScopeWithAlwaysIterableForeach: false
+		polluteScopeWithLoopInitialAssignments: false
+		reportAlwaysTrueInLastCondition: true
+		reportStaticMethodSignatures: true
+		reportWrongPhpDocTypeInVarTag: true
+		treatPhpDocTypesAsCertain: false
 		stubFiles:
 			# Simulate added properties
 			- phpstan/class-wp-post-type.stub

diff --git a/src/Abstracts/ConnectionType.php b/src/Abstracts/ConnectionType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\GraphQLType;
@@ -16,22 +18,21 @@
 	/**
 	 * Class - ConnectionType
 	 *
-	 * @phpstan-type ConnectionConfig array{
-	 *   fromType: string,
+	 * @phpstan-type ConnectionConfig array{fromType:string,
 	 *   fromFieldName: string,
 	 *   resolve: callable,
 	 *   oneToOne?: bool,
 	 *   toType?: string,
-	 *   connectionArgs?: array<string, array{
-	 *     type: string|array<string, string | array<string, string>>,
+	 *   connectionArgs?: array<string,array{
+	 *     type: string|array<string,string | array<string,string>>,
 	 *     description: string,
 	 *     defaultValue?: mixed
 	 *   }>,
-	 *   connectionFields?: array<string, array{
-	 *     type: string|array<string, string | array<string, string>>,
+	 *   connectionFields?: array<string,array{
+	 *     type: string|array<string,string | array<string,string>>,
 	 *     description: string,
-	 *     args?: array<string, array{
-	 *       type: string|array<string, string | array<string, string>>,
+	 *     args?: array<string,array{
+	 *       type: string|array<string,string | array<string,string>>,
 	 *       description: string,
 	 *       defaultValue?: mixed,
 	 *     }>,
@@ -53,11 +54,7 @@ public static function init(): void {
 		/**
 		 * Defines all possible connection args for the GraphQL type.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   defaultValue?: mixed
-		 * }>,
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:mixed}>
 		 */
 		abstract protected static function connection_args(): array;
 
@@ -82,11 +79,7 @@ protected static function get_connection_config( $config ): array {
 		 *
 		 * @param ?string[] $filter_by an array of specific connections to return.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   defaultValue?: mixed
-		 * }>
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:mixed}>
 		 */
 		final public static function get_connection_args( ?array $filter_by = null ): array {
 			$connection_args = static::connection_args();

diff --git a/src/Abstracts/EnumType.php b/src/Abstracts/EnumType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 if ( ! class_exists( '\AxeWP\GraphQL\Abstracts\EnumType' ) ) {
@@ -16,11 +18,7 @@ abstract class EnumType extends Type {
 		/**
 		 * Gets the Enum values configuration array.
 		 *
-		 * @return array<string, array{
-		 *   description: string,
-		 *   value: mixed,
-		 *   deprecationReason?: string
-		 * }>
+		 * @return array<string,array{description:string,value:mixed,deprecationReason?:string}>
 		 */
 		abstract public static function get_values(): array;
 

diff --git a/src/Abstracts/FieldsType.php b/src/Abstracts/FieldsType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\GraphQLType;

diff --git a/src/Abstracts/InputType.php b/src/Abstracts/InputType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\TypeWithInputFields;

diff --git a/src/Abstracts/InterfaceType.php b/src/Abstracts/InterfaceType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\TypeWithFields;

diff --git a/src/Abstracts/MutationType.php b/src/Abstracts/MutationType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 if ( ! class_exists( '\AxeWP\GraphQL\Abstracts\MutationType' ) ) {
@@ -16,28 +18,14 @@ abstract class MutationType extends Type {
 		/**
 		 * Gets the input fields for the mutation.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   defaultValue?: string
-		 * }>
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:string}>
 		 */
 		abstract public static function get_input_fields(): array;
 
 		/**
 		 * Gets the fields for the type.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   args?: array<string, array{
-		 *     type: string|array<string, string | array<string, string>>,
-		 *     description: string,
-		 *     defaultValue?: mixed
-		 *   }>,
-		 *   resolve?: callable,
-		 *   deprecationReason?: string,
-		 * }>
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,args?:array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:mixed}>,resolve?:callable,deprecationReason?:string}>
 		 */
 		abstract public static function get_output_fields(): array;
 

diff --git a/src/Abstracts/ObjectType.php b/src/Abstracts/ObjectType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\TypeWithFields;

diff --git a/src/Abstracts/Type.php b/src/Abstracts/Type.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Interfaces\GraphQLType;
@@ -39,7 +41,7 @@ abstract public static function get_description(): string;
 		/**
 		 * Gets the $config array used to register the type to WPGraphQL.
 		 *
-		 * @return array<string, mixed>
+		 * @return array<string,mixed>
 		 */
 		protected static function get_type_config(): array {
 			return [

diff --git a/src/Abstracts/UnionType.php b/src/Abstracts/UnionType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Abstracts
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Abstracts;
 
 use AxeWP\GraphQL\Traits\TypeResolverTrait;

diff --git a/src/Helper/Helper.php b/src/Helper/Helper.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Helper
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Helper;
 
 if ( ! class_exists( '\AxeWP\GraphQL\Helper\Helper' ) ) {
@@ -13,11 +15,11 @@
 	 * Class - Helper
 	 */
 	class Helper {
-				/**
-				 * The hook prefix for the plugin.
-				 *
-				 * @var string
-				 */
+		/**
+		 * The hook prefix for the plugin.
+		 *
+		 * @var string
+		 */
 		public static string $hook_prefix;
 
 		/**

diff --git a/src/Interfaces/GraphQLType.php b/src/Interfaces/GraphQLType.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\GraphQLType' ) ) {

diff --git a/src/Interfaces/Registrable.php b/src/Interfaces/Registrable.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\Registrable' ) ) {

diff --git a/src/Interfaces/TypeWithConnections.php b/src/Interfaces/TypeWithConnections.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\TypeWithConnections' ) ) {
@@ -16,18 +18,7 @@ interface TypeWithConnections extends GraphQLType {
 		/**
 		 * Gets the properties for the type.
 		 *
-		 * @return array<string, array{
-		 *   toType: string,
-		 *   description: string,
-		 *   args?: array<string, array{
-		 *     type: string|array<string, string | array<string, string>>,
-		 *     description: string,
-		 *     defaultValue?: mixed
-		 *   }>,
-		 *   connectionInterfaces?: string[],
-		 *   oneToOne?: bool,
-		 *   resolve?: callable,
-		 * }>
+		 * @return array<string,array{toType:string,description:string,args?:array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:mixed}>,connectionInterfaces?:string[],oneToOne?:bool,resolve?:callable}>
 		 */
 		public static function get_connections(): array;
 	}

diff --git a/src/Interfaces/TypeWithFields.php b/src/Interfaces/TypeWithFields.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\TypeWithFields' ) ) {
@@ -16,17 +18,7 @@ interface TypeWithFields extends GraphQLType {
 		/**
 		 * Gets the fields for the type.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   args?: array<string, array{
-		 *     type: string|array<string, string | array<string, string>>,
-		 *     description: string,
-		 *     defaultValue?: mixed
-		 *   }>,
-		 *   resolve?: callable,
-		 *   deprecationReason?: string,
-		 * }>
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,args?:array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:mixed}>,resolve?:callable,deprecationReason?:string}>
 		 */
 		public static function get_fields(): array;
 	}

diff --git a/src/Interfaces/TypeWithInputFields.php b/src/Interfaces/TypeWithInputFields.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\TypeWithInputFields' ) ) {
@@ -16,11 +18,7 @@ interface TypeWithInputFields extends GraphQLType {
 		/**
 		 * Gets the input fields for the type.
 		 *
-		 * @return array<string, array{
-		 *   type: string|array<string, string | array<string, string>>,
-		 *   description: string,
-		 *   defaultValue?: string
-		 * }>
+		 * @return array<string,array{type:string|array<string,string|array<string,string>>,description:string,defaultValue?:string}>
 		 */
 		public static function get_fields(): array;
 	}

diff --git a/src/Interfaces/TypeWithInterfaces.php b/src/Interfaces/TypeWithInterfaces.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Interfaces
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Interfaces;
 
 if ( ! interface_exists( '\AxeWP\GraphQL\Interfaces\TypeWithInterfaces' ) ) {

diff --git a/src/Traits/TypeNameTrait.php b/src/Traits/TypeNameTrait.php
@@ -5,6 +5,8 @@
  * @package AxeWP\GraphQL\Traits
  */
 
+declare( strict_types=1 );
+
 namespace AxeWP\GraphQL\Traits;
 
 use AxeWP\GraphQL\Helper\Helper;
@@ -22,14 +24,13 @@ trait TypeNameTrait {
 		 * @throws \Exception When the implementing class has no type name.
 		 */
 		final public static function get_type_name(): string {
-			if ( ! method_exists( static::class, 'type_name' ) ) {
+			if ( ! is_callable( [ static::class, 'type_name' ] ) ) {
 				throw new Exception(
 				// translators: the implementing class.
-					sprintf( __( 'To use TypeNameTrait, a %s must implement a `type_name()` method.', 'wp-graphql-plugin-name' ), static::class )
+					sprintf( esc_html__( 'To use TypeNameTrait, a %s must implement a `type_name()` method.', 'wp-graphql-plugin-name' ), static::class )
 				);
 			}
 
-			// @phpstan-ignore-next-line
 			$type_name = static::type_name();
 
 			$hook_prefix = Helper::hook_prefix();
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,6 @@ composer require axewp/wp-graphql-plugin-boilerplate @@
     },
     ```
     ### As a plugin starter
     #### 1. Initialize the plugin
@@ Expand Down @@