Auto-merge master back to develop

actions-user · actions-user · commit a66f3e1cf54b · 2024-04-23T20:31:27.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Changelog
 
+## 1.24.0
+
+### Upgrade Notice
+
+The AbstractConnectionResolver has undergone some refactoring. Some methods using `snakeCase` have been deprecated in favor of their `camel_case` equivalent. While we've preserved the deprecated methods to prevent breaking changes, you might begin seeing PHP notices about the deprecations. Any plugin that extends the AbstractConnectionResolver should update the following methods:
+
+- `getSource` -> `get_source`
+- `getContext` -> `get_context`
+- `getInfo` -> `get_info`
+- `getShouldExecute` -> `get_should_execute`
+- `getLoader` -> `getLoader`
+
+### New Features
+
+- [#3084](https://github.com/wp-graphql/wp-graphql/pull/3084): perf: refactor PluginConnectionResolver to only fetch plugins once. Thanks @justlevine!
+- [#3088](https://github.com/wp-graphql/wp-graphql/pull/3088): refactor: improve loader handling in AbstractConnectionResolver. Thanks @justlevine!
+- [#3087](https://github.com/wp-graphql/wp-graphql/pull/3087): feat: improve query amount handling in AbstractConnectionResolver. Thanks @justlevine!
+- [#3086](https://github.com/wp-graphql/wp-graphql/pull/3086): refactor: add AbstractConnectionResolver::get_unfiltered_args() public getter. Thanks @justlevine!
+- [#3085](https://github.com/wp-graphql/wp-graphql/pull/3085): refactor: add AbstractConnectionResolver::prepare_page_info()and only instantiate once. Thanks @justlevine!
+- [#3083](https://github.com/wp-graphql/wp-graphql/pull/3083): refactor: deprecate camelCase methods in AbstractConnectionResolver for snake_case equivalents. Thanks @justlevine!
+
+
+### Chores / Bugfixes
+
+- [#3095](https://github.com/wp-graphql/wp-graphql/pull/3095): chore: lint for superfluous whitespace. Thanks @justlevine!
+- [#3100](https://github.com/wp-graphql/wp-graphql/pull/3100): fix: recursion issues with interfaces
+- [#3082](https://github.com/wp-graphql/wp-graphql/pull/3082): chore: prepare ConnectionResolver classes for v2 backport
+
 ## 1.23.0
 
 ### New Features
diff --git a/constants.php b/constants.php
@@ -18,7 +18,7 @@ function graphql_setup_constants() {
 
 	// Plugin version.
 	if ( ! defined( 'WPGRAPHQL_VERSION' ) ) {
-		define( 'WPGRAPHQL_VERSION', '1.23.0' );
+		define( 'WPGRAPHQL_VERSION', '1.24.0' );
 	}
 
 	// Plugin Folder Path.
diff --git a/readme.txt b/readme.txt
@@ -87,6 +87,16 @@ Learn more about how [Appsero collects and uses this data](https://appsero.com/p
 
 == Upgrade Notice ==
 
+= 1.24.0 =
+
+The AbstractConnectionResolver has undergone some refactoring. Some methods using `snakeCase` have been deprecated in favor of their `camel_case` equivalent. While we've preserved the deprecated methods to prevent breaking changes, you might begin seeing PHP notices about the deprecations. Any plugin that extends the AbstractConnectionResolver should update the following methods:
+
+- `getSource` -> `get_source`
+- `getContext` -> `get_context`
+- `getInfo` -> `get_info`
+- `getShouldExecute` -> `get_should_execute`
+- `getLoader` -> `getLoader`
+
 = 1.16.0 =
 
 **WPGraphQL Smart Cache**
@@ -252,6 +262,24 @@ Composer dependencies are no longer versioned in Github. Recommended install sou
 
 == Changelog ==
 
+= 1.24.0 =
+
+**New Features**
+
+- [#3084](https://github.com/wp-graphql/wp-graphql/pull/3084): perf: refactor PluginConnectionResolver to only fetch plugins once. Thanks @justlevine!
+- [#3088](https://github.com/wp-graphql/wp-graphql/pull/3088): refactor: improve loader handling in AbstractConnectionResolver. Thanks @justlevine!
+- [#3087](https://github.com/wp-graphql/wp-graphql/pull/3087): feat: improve query amount handling in AbstractConnectionResolver. Thanks @justlevine!
+- [#3086](https://github.com/wp-graphql/wp-graphql/pull/3086): refactor: add AbstractConnectionResolver::get_unfiltered_args() public getter. Thanks @justlevine!
+- [#3085](https://github.com/wp-graphql/wp-graphql/pull/3085): refactor: add AbstractConnectionResolver::prepare_page_info()and only instantiate once. Thanks @justlevine!
+- [#3083](https://github.com/wp-graphql/wp-graphql/pull/3083): refactor: deprecate camelCase methods in AbstractConnectionResolver for snake_case equivalents. Thanks @justlevine!
+
+**Chores / Bugfixes**
+
+- [#3095](https://github.com/wp-graphql/wp-graphql/pull/3095): chore: lint for superfluous whitespace. Thanks @justlevine!
+- [#3100](https://github.com/wp-graphql/wp-graphql/pull/3100): fix: recursion issues with interfaces
+- [#3082](https://github.com/wp-graphql/wp-graphql/pull/3082): chore: prepare ConnectionResolver classes for v2 backport
+
+
 = 1.23.0 =
 
 **New Features**
diff --git a/src/Data/Connection/AbstractConnectionResolver.php b/src/Data/Connection/AbstractConnectionResolver.php
@@ -168,7 +168,7 @@ public function __construct( $source, array $args, AppContext $context, ResolveI
 
 		/**
 		 * @todo This exists for b/c, where extenders may be directly accessing `$this->args` in ::get_loader() or even `::get_args()`.
-		 * We can remove this once the rest of lifecyle has been updated.
+		 * We can remove this once the rest of lifecycle has been updated.
 		 */
 		$this->args = $args;
 
@@ -1131,59 +1131,59 @@ public function get_offset() {
 	/**
 	 * Returns the source of the connection.
 	 *
-	 * @deprecated @todo in favor of $this->get_source().
+	 * @deprecated 1.24.0 in favor of $this->get_source().
 	 *
 	 * @return mixed
 	 */
 	public function getSource() {
-		_deprecated_function( __METHOD__, '@todo', static::class . '::get_source()' );
+		_deprecated_function( __METHOD__, '1.24.0', static::class . '::get_source()' );
 
 		return $this->get_source();
 	}
 
 	/**
 	 * Returns the AppContext of the connection.
 	 *
-	 * @deprecated @todo in favor of $this->get_context().
+	 * @deprecated 1.24.0 in favor of $this->get_context().
 	 */
 	public function getContext(): AppContext {
-		_deprecated_function( __METHOD__, '@todo', static::class . '::get_context()' );
+		_deprecated_function( __METHOD__, '1.24.0', static::class . '::get_context()' );
 
 		return $this->get_context();
 	}
 
 	/**
 	 * Returns the ResolveInfo of the connection.
 	 *
-	 * @deprecated @todo in favor of $this->get_info().
+	 * @deprecated 1.24.0 in favor of $this->get_info().
 	 */
 	public function getInfo(): ResolveInfo {
-		_deprecated_function( __METHOD__, '@todo', static::class . '::get_info()' );
+		_deprecated_function( __METHOD__, '1.24.0', static::class . '::get_info()' );
 
 		return $this->get_info();
 	}
 
 	/**
 	 * Returns whether the connection should execute.
 	 *
-	 * @deprecated @todo in favor of $this->get_should_execute().
+	 * @deprecated 1.24.0 in favor of $this->get_should_execute().
 	 */
 	public function getShouldExecute(): bool {
-		_deprecated_function( __METHOD__, '@todo', static::class . '::should_execute()' );
+		_deprecated_function( __METHOD__, '1.24.0', static::class . '::should_execute()' );
 
 		return $this->get_should_execute();
 	}
 
 	/**
 	 * Returns the loader.
 	 *
-	 * @deprecated @todo in favor of $this->get_loader().
+	 * @deprecated 1.24.0 in favor of $this->get_loader().
 	 *
 	 * @return \WPGraphQL\Data\Loader\AbstractDataLoader
 	 * @throws \Exception
 	 */
 	protected function getLoader() {
-		_deprecated_function( __METHOD__, '@todo', static::class . '::get_loader()' );
+		_deprecated_function( __METHOD__, '1.24.0', static::class . '::get_loader()' );
 
 		return $this->get_loader();
 	}
diff --git a/wp-graphql.php b/wp-graphql.php
@@ -6,7 +6,7 @@
  * Description: GraphQL API for WordPress
  * Author: WPGraphQL
  * Author URI: http://www.wpgraphql.com
- * Version: 1.23.0
+ * Version: 1.24.0
  * Text Domain: wp-graphql
  * Domain Path: /languages/
  * Requires at least: 5.0
@@ -18,7 +18,7 @@
  * @package  WPGraphQL
  * @category Core
  * @author   WPGraphQL
- * @version  1.23.0
+ * @version  1.24.0
  */
 
 // Exit if accessed directly.

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function graphql_setup_constants() {`
`18`	`18`
`19`	`19`	`// Plugin version.`
`20`	`20`	`if ( ! defined( 'WPGRAPHQL_VERSION' ) ) {`
`21`		`- define( 'WPGRAPHQL_VERSION', '1.23.0' );`
	`21`	`+ define( 'WPGRAPHQL_VERSION', '1.24.0' );`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// Plugin Folder Path.`