Skip to content

downloadsRemaining returns null when is of valid type string #938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

downloadsRemaining returns null when is of valid type string #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
291ed88
fix: `downloadsRemaining` returns `null` when is of type `string`
hacknug May 23, 2025
030f949
test: update tests to match parsing of `downloadsRemaining`
hacknug May 23, 2025
1b42262
fix: ensure `get_query_args` parses `downloads_remaining` correctly w…
hacknug May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions includes/data/connection/class-downloadable-item-connection-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public function get_query_args() {
$is_expired = isset( $downloadable_item['access_expires'] )
? time() > $downloadable_item['access_expires']->getTimestamp()
: false;
$downloads_remaining = ( 'integer' === gettype( $downloadable_item['downloads_remaining'] ) )
? 0 < $downloadable_item['downloads_remaining']
$downloads_remaining = ( is_numeric( $downloadable_item['downloads_remaining'] ) )
? 0 < intval( $downloadable_item['downloads_remaining'] )
: true;

return $active ? ( ! $is_expired && $downloads_remaining ) : ( $is_expired || ! $downloads_remaining );
Expand All @@ -79,8 +79,8 @@ public function get_query_args() {
$has_downloads_remaining = $where_args['hasDownloadsRemaining'];

$query_args['filters'][] = static function ( $downloadable_item ) use ( $has_downloads_remaining ) {
$downloads_remaining = ( 'integer' === gettype( $downloadable_item['downloads_remaining'] ) )
? 0 < $downloadable_item['downloads_remaining']
$downloads_remaining = ( is_numeric( $downloadable_item['downloads_remaining'] ) )
? 0 < intval( $downloadable_item['downloads_remaining'] )
: true;

return $has_downloads_remaining === $downloads_remaining;
Expand Down
4 changes: 2 additions & 2 deletions includes/type/object/class-downloadable-item-type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public static function register() {
'type' => 'Int',
'description' => __( 'Number of times the item can be downloaded.', 'wp-graphql-woocommerce' ),
'resolve' => static function ( $source ) {
return isset( $source['downloads_remaining'] ) && 'integer' === gettype( $source['downloads_remaining'] )
? $source['downloads_remaining']
return isset( $source['downloads_remaining'] ) && is_numeric( $source['downloads_remaining'] )
? intval( $source['downloads_remaining'] )
: null;
},
],
Expand Down
4 changes: 2 additions & 2 deletions tests/_support/Helper/crud-helpers/customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ public function print_downloadables( $id ) {
'url' => $item['download_url'],
'accessExpires' => $item['access_expires'],
'downloadId' => $item['download_id'],
'downloadsRemaining' => isset( $item['downloads_remaining'] ) && 'integer' === gettype( $item['downloads_remaining'] )
? $item['downloads_remaining']
'downloadsRemaining' => isset( $item['downloads_remaining'] ) && is_numeric( $item['downloads_remaining'] )
? intval( $item['downloads_remaining'] )
: null,
'name' => $item['download_name'],
'product' => array( 'databaseId' => $item['product_id'] ),
Expand Down
4 changes: 2 additions & 2 deletions tests/_support/Helper/crud-helpers/order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,8 @@ public function print_downloadables( $id ) {
'url' => $item['download_url'],
'accessExpires' => $item['access_expires'],
'downloadId' => $item['download_id'],
'downloadsRemaining' => isset( $item['downloads_remaining'] ) && 'integer' === gettype( $item['downloads_remaining'] )
? $item['downloads_remaining']
'downloadsRemaining' => isset( $item['downloads_remaining'] ) && is_numeric( $item['downloads_remaining'] )
? intval( $item['downloads_remaining'] )
: null,
'name' => $item['download_name'],
'product' => array( 'databaseId' => $item['product_id'] ),
Expand Down
8 changes: 4 additions & 4 deletions tests/wpunit/DownloadableItemQueriesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ function ( $item ) {
$this->expectedField( 'downloadId', $item['download_id'] ),
$this->expectedField(
'downloadsRemaining',
isset( $item['downloads_remaining'] ) && 'integer' === gettype( $item['downloads_remaining'] )
? $item['downloads_remaining']
isset( $item['downloads_remaining'] ) && is_numeric( $item['downloads_remaining'] )
? intval( $item['downloads_remaining'] )
: static::IS_NULL
),
$this->expectedField( 'name', $item['download_name'] ),
Expand Down Expand Up @@ -360,8 +360,8 @@ function ( $item ) {
$this->expectedField( 'downloadId', $item['download_id'] ),
$this->expectedField(
'downloadsRemaining',
isset( $item['downloads_remaining'] ) && 'integer' === gettype( $item['downloads_remaining'] )
? $item['downloads_remaining']
isset( $item['downloads_remaining'] ) && is_numeric( $item['downloads_remaining'] )
? intval( $item['downloads_remaining'] )
: static::IS_NULL
),
$this->expectedField( 'name', $item['download_name'] ),
Expand Down
Loading