- update Types in docblocks to be compatible with WPGraphQL v2 / graphql-php v15+

Author: jasonbahl

readme.txt

@@ -4,7 +4,9 @@ Tags: WPGraphQL, Cache, API, Invalidation, Persisted Queries, GraphQL, Performan
 Requires at least: 5.6
 Tested up to: 6.5
 Requires PHP: 7.4
-Stable tag: 1.3.3
+Stable tag: 2.0.0
+Requires WPGraphQL: 2.0.0
+WPGraphQL Tested Up To: 2.0.0
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -65,6 +67,10 @@ Learn more about how [Appsero collects and uses this data](https://appsero.com/p
 
 == Upgrade Notice ==
 
+= 2.0.0 =
+
+This release includes breaking changes to be compatible with WPGraphQL 2.0.0. When upgrading WPGraphQL to v2.0.0, you must also upgrade WPGraphQL Smart Cache to v2.0.0. WPGraphQL Smart Cache v2.0.0 is not compatible with WPGraphQL v1.x.x.
+
 = 1.3.0 =
 
 This fixes a regression to WPGraphQL v1.20.0 where the Query Analyzer became optional and defaulted to "off". WPGraphQL Smart Cache force-enables the Query Analyzer to support Cache tagging and tag-based cache invalidation.
@@ -98,6 +104,14 @@ In order to use v0.2.0+ of WPGraphQL Smart Cache, you will need WPGraphQL v1.12.
 
 == Changelog ==
 
+= 2.0.0 =
+
+**Breaking Changes**
+
+- This release includes breaking changes to be compatible with WPGraphQL 2.0.0. When upgrading WPGraphQL to v2.0.0, you must also upgrade WPGraphQL Smart Cache to v2.0.0. WPGraphQL Smart Cache v2.0.0 is not compatible with WPGraphQL v1.x.x.
+
+
+
 = 1.3.3 =
 
 **Chores / Bugfixes**

src/Document/Loader.php

@@ -14,15 +14,13 @@ class Loader {
 	/**
 	 * When a queryId is found on the request, this call back is invoked to look up the query
 	 * string
-	 * Can be invoked on GET or POST params
 	 *
-	 * @param string $query_id        An array containing the pieces of the data of the GraphQL
-	 *                                request
-	 * @param array $operation_params An array containing the method, body and query params
+	 * @param string $query_id The persisted query ID
+	 * @param array $operation_params The operation parameters
 	 *
 	 * @return string|\GraphQL\Language\AST\DocumentNode
 	 */
-	public static function by_query_id( $query_id, $operation_params ) {
+	public static function by_query_id( string $query_id, array $operation_params ) {
 		$content = new Document();
 		$query   = $content->get( $query_id );
 

wp-graphql-smart-cache.php

@@ -6,12 +6,14 @@
  * Description: Smart Caching and Cache Invalidation for WPGraphQL
  * Author: WPGraphQL
  * Author URI: http://www.wpgraphql.com
- * Requires at least: 5.6
+ * Requires at least: 6.0
  * Tested up to: 6.6.1
  * Requires PHP: 7.4
+ * Requires WPGraphQL: 2.0.0
+ * WPGraphQL Tested Up To: 2.0.0
  * Text Domain: wp-graphql-smart-cache
  * Domain Path: /languages
- * Version: 1.3.3
+ * Version: 2.0.0
  * License: GPL-3
  * License URI: https://www.gnu.org/licenses/gpl-3.0.html
  *
@@ -46,7 +48,7 @@
 }
 
 if ( ! defined( 'WPGRAPHQL_SMART_CACHE_VERSION' ) ) {
-	define( 'WPGRAPHQL_SMART_CACHE_VERSION', '1.3.3' );
+	define( 'WPGRAPHQL_SMART_CACHE_VERSION', '2.0.0' );
 }
 
 if ( ! defined( 'WPGRAPHQL_SMART_CACHE_WPGRAPHQL_REQUIRED_MIN_VERSION' ) ) {
@@ -100,7 +102,9 @@ function can_load_plugin() {
 	'graphql_server_config',
 	function ( \GraphQL\Server\ServerConfig $config ) {
 		$config->setPersistedQueryLoader(
-			[ Loader::class, 'by_query_id' ]
+			function ( string $queryId, \GraphQL\Server\OperationParams $params ) {
+				return Loader::by_query_id( $queryId, (array) $params );
+			}
 		);
 	},
 	10,