Merge f7309af into 36f3a7e

wp-graphql · Apr 22, 2024 · a2e89fb · a2e89fb
2 parents 36f3a7e + f7309af
commit a2e89fb
Show file tree

Hide file tree

Showing 14 changed files with 421 additions and 237 deletions.
diff --git a/src/Data/Connection/AbstractConnectionResolver.php b/src/Data/Connection/AbstractConnectionResolver.php
diff --git a/src/Data/Connection/CommentConnectionResolver.php b/src/Data/Connection/CommentConnectionResolver.php
@@ -29,8 +29,7 @@ public function get_query_args() {
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
 
 		$query_args = [];
 
@@ -49,7 +48,7 @@ public function get_query_args() {
 		 *
 		 * @since 0.0.6
 		 */
-		$query_args['number'] = min( max( absint( $first ), absint( $last ), 10 ), $this->get_query_amount() ) + 1;
+		$query_args['number'] = $this->get_query_amount() + 1;
 
 		/**
 		 * Set the default order
@@ -158,7 +157,7 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'comment';
 	}
 
@@ -183,7 +182,7 @@ public function get_ids_from_query() {
 	 * @return array<string,mixed>
 	 */
 	public function get_args(): array {
-		$args = $this->args;
+		$args = $this->get_unfiltered_args();
 
 		if ( ! empty( $args['where'] ) ) {
 			// Ensure all IDs are converted to database IDs.

diff --git a/src/Data/Connection/ContentTypeConnectionResolver.php b/src/Data/Connection/ContentTypeConnectionResolver.php
@@ -61,7 +61,7 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'post_type';
 	}
 

diff --git a/src/Data/Connection/EnqueuedScriptsConnectionResolver.php b/src/Data/Connection/EnqueuedScriptsConnectionResolver.php
@@ -1,39 +1,12 @@
 <?php
 namespace WPGraphQL\Data\Connection;
 
-use GraphQL\Type\Definition\ResolveInfo;
-use WPGraphQL\AppContext;
-
 /**
  * Class EnqueuedScriptsConnectionResolver
  *
  * @package WPGraphQL\Data\Connection
  */
 class EnqueuedScriptsConnectionResolver extends AbstractConnectionResolver {
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function __construct( $source, array $args, AppContext $context, ResolveInfo $info ) {
-
-		/**
-		 * Filter the query amount to be 1000 for
-		 */
-		add_filter(
-			'graphql_connection_max_query_amount',
-			static function ( $max, $source, $args, $context, ResolveInfo $info ) {
-				if ( 'enqueuedScripts' === $info->fieldName || 'registeredScripts' === $info->fieldName ) {
-					return 1000;
-				}
-				return $max;
-			},
-			10,
-			5
-		);
-
-		parent::__construct( $source, $args, $context, $info );
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -72,10 +45,17 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'enqueued_script';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	protected function max_query_amount(): int {
+		return 1000;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 *

diff --git a/src/Data/Connection/EnqueuedStylesheetConnectionResolver.php b/src/Data/Connection/EnqueuedStylesheetConnectionResolver.php
@@ -1,9 +1,6 @@
 <?php
 namespace WPGraphQL\Data\Connection;
 
-use GraphQL\Type\Definition\ResolveInfo;
-use WPGraphQL\AppContext;
-
 /**
  * Class EnqueuedStylesheetConnectionResolver
  *
@@ -17,29 +14,6 @@ class EnqueuedStylesheetConnectionResolver extends AbstractConnectionResolver {
 	 */
 	protected $query;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function __construct( $source, array $args, AppContext $context, ResolveInfo $info ) {
-
-		/**
-		 * Filter the query amount to be 1000 for
-		 */
-		add_filter(
-			'graphql_connection_max_query_amount',
-			static function ( $max, $source, $args, $context, ResolveInfo $info ) {
-				if ( 'enqueuedStylesheets' === $info->fieldName || 'registeredStylesheets' === $info->fieldName ) {
-					return 1000;
-				}
-				return $max;
-			},
-			10,
-			5
-		);
-
-		parent::__construct( $source, $args, $context, $info );
-	}
-
 	/**
 	 * {@inheritDoc}
 	 */
@@ -78,10 +52,17 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'enqueued_stylesheet';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	protected function max_query_amount(): int {
+		return 1000;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 *

diff --git a/src/Data/Connection/MenuItemConnectionResolver.php b/src/Data/Connection/MenuItemConnectionResolver.php
@@ -80,7 +80,7 @@ public function get_query_args() {
 	 * {@inheritDoc}
 	 */
 	public function get_args(): array {
-		$args = $this->args;
+		$args = $this->get_unfiltered_args();
 
 		if ( ! empty( $args['where'] ) ) {
 			// Ensure all IDs are converted to database IDs.
@@ -106,6 +106,6 @@ public function get_args(): array {
 		 *
 		 * @since 1.11.0
 		 */
-		return apply_filters( 'graphql_menu_item_connection_args', $args, $this->args );
+		return apply_filters( 'graphql_menu_item_connection_args', $args, $this->get_unfiltered_args() );
 	}
 }
diff --git a/src/Data/Connection/PluginConnectionResolver.php b/src/Data/Connection/PluginConnectionResolver.php
@@ -225,7 +225,7 @@ static function ( $plugin ) use ( $s ) {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'plugin';
 	}
 

diff --git a/src/Data/Connection/PostObjectConnectionResolver.php b/src/Data/Connection/PostObjectConnectionResolver.php
@@ -69,7 +69,7 @@ public function __construct( $source, array $args, AppContext $context, ResolveI
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'post';
 	}
 
@@ -149,8 +149,7 @@ public function get_query_args() {
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
 
 		$query_args = [];
 		/**
@@ -176,10 +175,10 @@ public function get_query_args() {
 		/**
 		 * Set posts_per_page the highest value of $first and $last, with a (filterable) max of 100
 		 */
-		$query_args['posts_per_page'] = $this->one_to_one ? 1 : min( max( absint( $first ), absint( $last ), 10 ), $this->query_amount ) + 1;
+		$query_args['posts_per_page'] = $this->one_to_one ? 1 : $this->get_query_amount() + 1;
 
 		// set the graphql cursor args
-		$query_args['graphql_cursor_compare'] = ( ! empty( $last ) ) ? '>' : '<';
+		$query_args['graphql_cursor_compare'] = ! empty( $last ) ? '>' : '<';
 		$query_args['graphql_after_cursor']   = $this->get_after_offset();
 		$query_args['graphql_before_cursor']  = $this->get_before_offset();
 
@@ -533,7 +532,7 @@ static function ( $status ) use ( $post_type_objects ) {
 	 * {@inheritDoc}
 	 */
 	public function get_args(): array {
-		$args = $this->args;
+		$args = $this->get_unfiltered_args();
 
 		if ( ! empty( $args['where'] ) ) {
 			// Ensure all IDs are converted to database IDs.
@@ -580,7 +579,7 @@ static function ( $id ) {
 		 *
 		 * @since 1.11.0
 		 */
-		return apply_filters( 'graphql_post_object_connection_args', $args, $this, $this->args );
+		return apply_filters( 'graphql_post_object_connection_args', $args, $this, $this->get_unfiltered_args() );
 	}
 
 	/**

diff --git a/src/Data/Connection/TaxonomyConnectionResolver.php b/src/Data/Connection/TaxonomyConnectionResolver.php
@@ -62,7 +62,7 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'taxonomy';
 	}
 

diff --git a/src/Data/Connection/TermObjectConnectionResolver.php b/src/Data/Connection/TermObjectConnectionResolver.php
@@ -59,8 +59,7 @@ public function get_query_args() {
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
 
 		/**
 		 * Set hide_empty as false by default
@@ -70,7 +69,7 @@ public function get_query_args() {
 		/**
 		 * Set the number, ensuring it doesn't exceed the amount set as the $max_query_amount
 		 */
-		$query_args['number'] = min( max( absint( $first ), absint( $last ), 10 ), $this->query_amount ) + 1;
+		$query_args['number'] = $this->get_query_amount() + 1;
 
 		/**
 		 * Don't calculate the total rows, it's not needed and can be expensive
@@ -174,7 +173,7 @@ public function get_ids_from_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'term';
 	}
 
@@ -243,7 +242,7 @@ public function sanitize_input_fields() {
 	 * {@inheritDoc}
 	 */
 	public function get_args(): array {
-		$args = $this->args;
+		$args = $this->get_unfiltered_args();
 
 		if ( ! empty( $args['where'] ) ) {
 			// Ensure all IDs are converted to database IDs.
@@ -284,7 +283,7 @@ static function ( $id ) {
 		 *
 		 * @since 1.11.0
 		 */
-		return apply_filters( 'graphql_term_object_connection_args', $args, $this, $this->args );
+		return apply_filters( 'graphql_term_object_connection_args', $args, $this, $this->get_unfiltered_args() );
 	}
 
 	/**

diff --git a/src/Data/Connection/ThemeConnectionResolver.php b/src/Data/Connection/ThemeConnectionResolver.php
@@ -56,7 +56,7 @@ public function get_query() {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'theme';
 	}
 

diff --git a/src/Data/Connection/UserConnectionResolver.php b/src/Data/Connection/UserConnectionResolver.php
@@ -23,7 +23,7 @@ class UserConnectionResolver extends AbstractConnectionResolver {
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'user';
 	}
 

diff --git a/src/Data/Connection/UserRoleConnectionResolver.php b/src/Data/Connection/UserRoleConnectionResolver.php
@@ -57,14 +57,14 @@ public function get_query_args() {
 	 */
 	public function get_query() {
 		$wp_roles = wp_roles();
-		
+
 		return ! empty( $wp_roles->get_names() ) ? array_keys( $wp_roles->get_names() ) : [];
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
-	public function get_loader_name() {
+	protected function loader_name(): string {
 		return 'user_role';
 	}