fix: "key" argument for MetaData fields fixed (#921)

Author: kidunot89

bin/_lib.sh

@@ -35,7 +35,6 @@ install_wordpress() {
 	composer require --dev --no-interaction -W \
 		johnpbloch/wordpress:* \
         wp-graphql/wp-graphql-jwt-authentication \
-        axepress/wp-graphql-headless-login \
         wpackagist-plugin/woocommerce \
         wpackagist-plugin/woocommerce-gateway-stripe \
         wpackagist-plugin/wp-graphql \

composer.lock

@@ -88,31 +88,33 @@ public static function get_metadata_field_definition() {
 
 				// Check "key" argument and format meta_data objects.
 				if ( ! empty( $args['key'] ) && $source->meta_exists( $args['key'] ) ) {
-					$data = $source->get_meta( $args['key'], $single );
-					if ( ! is_array( $data ) ) {
-						$data = array_filter(
-							$source->get_meta_data(),
-							static function ( $meta ) use ( $data ) {
-								return $meta->value === $data;
-							}
-						);
+					$key  = $args['key'];
+					$data = $source->get_meta( $key, false );
+					if ( empty( $data ) ) {
+						$data = [];
+					} elseif ( $single ) {
+						$data = array_slice( $data, 0, 1 );
 					}
+
+					$data = array_map(
+						static function ( $value ) {
+							return (object) $value;
+						},
+						$data
+					);
 				} elseif ( ! empty( $args['keysIn'] ) ) {
 					// Check "keysIn" argument and format meta_data objects.
-					$keys = $args['keysIn'];
+					$keys_in = $args['keysIn'];
 
 					$found = [];
 					$data  = array_filter(
 						$source->get_meta_data(),
-						static function ( $meta ) use ( $keys, $single, &$found ) {
-							if ( in_array( $meta->key, $keys, true ) ) {
-								if ( $single ) {
-									if ( ! in_array( $meta->key, $found, true ) ) {
-										$found[] = $meta->key;
-										return true;
-									}
+						static function ( $meta ) use ( $keys_in, $single, &$found ) {
+							if ( in_array( $meta->key, $keys_in, true ) ) {
+								if ( $single && in_array( $meta->key, $found, true ) ) {
 									return false;
 								}
+								$found[] = $meta->key;
 								return true;
 							}
 						}
@@ -123,13 +125,11 @@ static function ( $meta ) use ( $keys, $single, &$found ) {
 					$data  = array_filter(
 						$source->get_meta_data(),
 						static function ( $meta ) use ( $single, &$found ) {
-							if ( $single ) {
-								if ( ! in_array( $meta->key, $found, true ) ) {
-									$found[] = $meta->key;
-									return true;
-								}
+							if ( $single && in_array( $meta->key, $found, true ) ) {
 								return false;
 							}
+
+							$found[] = $meta->key;
 							return true;
 						}
 					);

includes/type/object/class-meta-data-type.php

@@ -86,9 +86,9 @@ public function __construct(
         ClientInterface $httpClient,
         RequestFactoryInterface $httpFactory,
         CacheItemPoolInterface $cache,
-        int $expiresAfter = null,
+        ?int $expiresAfter = null,
         bool $rateLimit = false,
-        string $defaultAlg = null
+        ?string $defaultAlg = null
     ) {
         $this->jwksUri = $jwksUri;
         $this->httpClient = $httpClient;
@@ -186,7 +186,7 @@ private function keyIdExists(string $keyId): bool
             $jwksResponse = $this->httpClient->sendRequest($request);
             if ($jwksResponse->getStatusCode() !== 200) {
                 throw new UnexpectedValueException(
-                    sprintf('HTTP Error: %d %s for URI "%s"',
+                    \sprintf('HTTP Error: %d %s for URI "%s"',
                         $jwksResponse->getStatusCode(),
                         $jwksResponse->getReasonPhrase(),
                         $this->jwksUri,