Merge pull request #457 from wp-graphql/bugfix/product-reviews-connections

Bugfix/product reviews connections

Author: kidunot89

.github/workflows/continous-integration.yml

@@ -24,7 +24,6 @@ jobs:
       matrix:
         php: ['7.4', '7.3', '7.2', '7.1']
         wordpress: ['5.6', '5.0']
-        debug: ['--ext DotReporter']
         include:
           - php: '7.4'
             wordpress: '5.6'

composer.json

@@ -31,23 +31,23 @@
         "firebase/php-jwt": "^5.0"
     },
     "require-dev": {
-        "composer/installers": "^1.9",
-        "lucatume/wp-browser": "^2.6.",
-        "wp-graphql/wp-graphql-testcase": "^1.0.1",
         "codeception/module-asserts": "^1.0",
-        "codeception/util-universalframework": "^1.0",
         "codeception/module-rest": "^1.2",
+        "codeception/util-universalframework": "^1.0",
+        "composer/installers": "^1.9",
+        "johnpbloch/wordpress": "^5.7",
+        "lucatume/wp-browser": "^2.6.",
+        "phpunit/phpunit": "<=9.4.4",
         "simpod/php-coveralls-mirror": "^3.0",
+        "squizlabs/php_codesniffer": "^3.5",
         "stripe/stripe-php": "^7.75",
         "wp-coding-standards/wpcs": "^2.3",
-        "johnpbloch/wordpress": "~5.3",
         "wp-graphql/wp-graphql-jwt-authentication": "^0.4.1",
-        "wpackagist-plugin/wp-graphql": "^1.1.8",
-        "wpackagist-plugin/woocommerce": "^5.0",
+        "wp-graphql/wp-graphql-testcase": "^1.0.1",
+        "wpackagist-plugin/woocommerce": "^5.1.0",
         "wpackagist-plugin/woocommerce-gateway-stripe": "^4.5",
-        "wpackagist-theme/twentytwentyone": "^1.0",
-        "phpunit/phpunit": "<=9.4.4",
-        "squizlabs/php_codesniffer": "^3.5"
+        "wpackagist-plugin/wp-graphql": "^1.2.6",
+        "wpackagist-theme/twentytwentyone": "^1.0"
     },
     "config": {
         "optimize-autoloader": true,

includes/connection/class-comments.php

@@ -54,6 +54,14 @@ public static function register_connections() {
 							},
 						),
 					),
+					'resolve'          => function( $source, array $args, AppContext $context, ResolveInfo $info ) {
+						$resolver = new \WPGraphQL\Data\Connection\CommentConnectionResolver( $source, $args, $context, $info );
+
+						$resolver->set_query_arg( 'post_type', 'product' );
+						$resolver->set_query_arg( 'post_id', $source->ID );
+
+						return $resolver->get_connection();
+					},
 				)
 			)
 		);

includes/data/loader/class-wc-db-loader.php

@@ -67,7 +67,14 @@ public function loadKeys( array $keys ) {
 				$loader = array( $this, 'load_tax_rate_from_id' );
 				break;
 			default:
-				$loader = apply_filters( 'woographql_db_loader_func', null );
+				/**
+				 * For adding custom key types to this loader
+				 *
+				 * @param callable|null $loader       Callback that gets entry from key.
+				 * @param string        $loader_type  Used to determine loader being used for this instance of the loader.
+				 */
+				$loader = apply_filters( 'woographql_db_loader_func', null, $this->loader_type );
+
 				if ( empty( $loader ) ) {
 					throw new \Exception(
 						/* translators: %s: Loader Type */

tests/wpunit/CartQueriesTest.php

@@ -365,7 +365,7 @@ public function testCartItemPagination() {
 		 *
 		 * Tests "first" parameter.
 		 */
-		$variables = array( 'first' => 2 );
+		$variables = array( 'first' => 2, 'after' => '' );
 		$response  = $this->graphql( compact( 'query', 'variables' ) );
 
 		$expected = array_merge(
@@ -419,8 +419,11 @@ public function testCartItemPagination() {
 
 		$this->assertQuerySuccessful(
 			$response,
-			// Only check the edges.
-			array_map( $expected_edge_mapper, array_slice( $cart_items, 0, 4 ), range( 0, 3 ) )
+			array_map( // Only check the edges.
+				$expected_edge_mapper,
+				array_slice( $cart_items, 0, 4 ),
+				range( 3, 0, -1 ) // Reverse
+			)
 		);
 	}
 }

vendor/composer/InstalledVersions.php

@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => 'dc14001926d81c1bdc5e4047723ce57e84cc5520',
+    'reference' => 'cb0e6f83f07b623f260809556e194b132a9fefd8',
     'name' => 'wp-graphql/wp-graphql-woocommerce',
   ),
   'versions' => 
@@ -50,7 +50,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => 'dc14001926d81c1bdc5e4047723ce57e84cc5520',
+      'reference' => 'cb0e6f83f07b623f260809556e194b132a9fefd8',
     ),
   ),
 );

vendor/composer/installed.php

@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => 'dc14001926d81c1bdc5e4047723ce57e84cc5520',
+    'reference' => 'cb0e6f83f07b623f260809556e194b132a9fefd8',
     'name' => 'wp-graphql/wp-graphql-woocommerce',
   ),
   'versions' => 
@@ -27,7 +27,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => 'dc14001926d81c1bdc5e4047723ce57e84cc5520',
+      'reference' => 'cb0e6f83f07b623f260809556e194b132a9fefd8',
     ),
   ),
 );