Skip to content

[Bug] GraphQL SearchCriteriaValidator not loaded — removed by module-graph-ql di.xml array override #40742

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

Merged
magento-devops-reposync-svc merged 8 commits into from
May 20, 2026
Merged

[Bug] GraphQL SearchCriteriaValidator not loaded — removed by module-graph-ql di.xml array override #40742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20b7fb5
Fixed search criteria validator
mtytula Apr 15, 2026
9310bb4
Merge branch '2.4-develop' into fix/graphql-page-size-limit
mtytula Apr 21, 2026
5366e43
Merge branch '2.4-develop' into fix/graphql-page-size-limit
mtytula Apr 27, 2026
c5c3fbd
Merge branch '2.4-develop' into fix/graphql-page-size-limit
engcom-Hotel May 5, 2026
64b22e6
test(graphql): add automated tests for SearchCriteriaValidator enforc…
mtytula May 6, 2026
f5e2680
test(graphql): add automated tests for SearchCriteriaValidator enforc…
mtytula May 6, 2026
2e6713c
test(graphql): add automated tests for SearchCriteriaValidator enforc…
mtytula May 6, 2026
c51178c
Merge branch '2.4-develop' into fix/graphql-page-size-limit
engcom-Dash May 12, 2026
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
5 changes: 2 additions & 3 deletions app/code/Magento/GraphQl/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,8 @@
<type name="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator">
<arguments>
<argument name="validators" xsi:type="array">
<item name="backpressureValidator" xsi:type="object">
Magento\GraphQl\Model\Backpressure\BackpressureFieldValidator
</item>
<item name="searchCriteriaValidator" xsi:type="object">Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\SearchCriteriaValidator</item>
<item name="backpressureValidator" xsi:type="object">Magento\GraphQl\Model\Backpressure\BackpressureFieldValidator</item>
</argument>
</arguments>
</type>
Expand Down
7 changes: 0 additions & 7 deletions app/etc/di.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1990,13 +1990,6 @@
</arguments>
</type>
<preference for="Magento\Framework\GraphQl\Query\Resolver\Argument\ValidatorInterface" type="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator"/>
<type name="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator">
<arguments>
<argument name="validators" xsi:type="array">
<item name="searchCriteriaValidator" xsi:type="object">Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\SearchCriteriaValidator</item>
</argument>
</arguments>
</type>
<type name="Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\SearchCriteriaValidator">
<arguments>
<argument name="maxPageSize" xsi:type="number">300</argument>
Expand Down
85 changes: 85 additions & 0 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Query/SearchCriteriaValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?php
/**
* Copyright 2026 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\GraphQl\Query;

use Magento\TestFramework\Fixture\Config;
use Magento\TestFramework\TestCase\GraphQlAbstract;
use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;

/**
* Verify that SearchCriteriaValidator enforces the pageSize limit in GraphQL queries.
*
* Regression: Magento_GraphQl module-level di.xml was overriding the global di.xml array argument
* for CompositeValidator, silently dropping SearchCriteriaValidator from the composite.
*/
class SearchCriteriaValidatorTest extends GraphQlAbstract
{
/**
* Verify that a pageSize argument exceeding the configured maximum returns an error.
*/
#[
Config('graphql/validation/input_limit_enabled', 1),
Config('graphql/validation/maximum_page_size', 5)
]
public function testProductsQueryExceedingPageSizeReturnsError()
{
$query = <<<QUERY
{
products(pageSize: 6, filter: {sku: {eq: "test"}}) {
total_count
}
}
QUERY;

$this->expectException(ResponseContainsErrorsException::class);
$this->expectExceptionMessage('Maximum pageSize is 5');
$this->graphQlQuery($query);
}

/**
* Verify that a pageSize argument within the configured maximum succeeds.
*/
#[
Config('graphql/validation/input_limit_enabled', 1),
Config('graphql/validation/maximum_page_size', 5)
]
public function testProductsQueryWithinPageSizeLimitSucceeds()
{
$query = <<<QUERY
{
products(pageSize: 5, filter: {sku: {eq: "test"}}) {
total_count
}
}
QUERY;

$response = $this->graphQlQuery($query);
$this->assertArrayHasKey('products', $response);
}

/**
* Verify that pageSize is not enforced when input limiting is disabled.
*/
#[
Config('graphql/validation/input_limit_enabled', 0),
Config('graphql/validation/maximum_page_size', 5)
]
public function testProductsQueryPageSizeNotEnforcedWhenLimitingDisabled()
{
$query = <<<QUERY
{
products(pageSize: 100, filter: {sku: {eq: "test"}}) {
total_count
}
}
QUERY;

$response = $this->graphQlQuery($query);
$this->assertArrayHasKey('products', $response);
}
}
98 changes: 98 additions & 0 deletions dev/tests/integration/testsuite/Magento/GraphQl/Query/CompositeValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php
/**
* Copyright 2026 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\GraphQl\Query;

use Magento\Framework\App\Area;
use Magento\Framework\GraphQl\Config\Element\Field;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Query\Resolver\Argument\Validator\CompositeValidator;
use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Fixture\AppArea;
use Magento\TestFramework\Fixture\Config;
use Magento\TestFramework\Fixture\DbIsolation;
use Magento\TestFramework\Helper\Bootstrap;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\TestCase;

/**
* Verify that CompositeValidator correctly delegates to all registered validators.
*
* Integration test for composites per DoD: ensures SearchCriteriaValidator and
* BackpressureFieldValidator are loaded and functional within the composite.
*
* Regression: module-level di.xml array arguments replace global di.xml entries,
* so SearchCriteriaValidator was silently dropped from CompositeValidator.
*/
#[
CoversClass(CompositeValidator::class),
AppArea(Area::AREA_GRAPHQL),
DbIsolation(false),
]
class CompositeValidatorTest extends TestCase
{
/**
* @var CompositeValidator
*/
private CompositeValidator $compositeValidator;

/**
* @inheritDoc
*/
protected function setUp(): void
{
$this->compositeValidator = Bootstrap::getObjectManager()->get(CompositeValidator::class);
}

/**
* Verify SearchCriteriaValidator in composite enforces pageSize when limiting is enabled.
*/
#[
Config('graphql/validation/input_limit_enabled', 1, ScopeInterface::SCOPE_STORE, 'default'),
Config('graphql/validation/maximum_page_size', 5, ScopeInterface::SCOPE_STORE, 'default')
]
public function testSearchCriteriaValidatorEnforcesPageSizeLimit(): void
{
$field = $this->createMock(Field::class);

$this->expectException(GraphQlInputException::class);
$this->expectExceptionMessage('Maximum pageSize is 5');
$this->compositeValidator->validate($field, ['pageSize' => 6]);
}

/**
* Verify composite does not throw when pageSize is within the configured limit.
*
* @doesNotPerformAssertions
*/
#[
Config('graphql/validation/input_limit_enabled', 1, ScopeInterface::SCOPE_STORE, 'default'),
Config('graphql/validation/maximum_page_size', 5, ScopeInterface::SCOPE_STORE, 'default')
]
public function testCompositeAllowsPageSizeWithinLimit(): void
{
$field = $this->createMock(Field::class);

$this->compositeValidator->validate($field, ['pageSize' => 5]);
}

/**
* Verify composite does not throw when input limiting is disabled.
*
* @doesNotPerformAssertions
*/
#[
Config('graphql/validation/input_limit_enabled', 0, ScopeInterface::SCOPE_STORE, 'default'),
Config('graphql/validation/maximum_page_size', 5, ScopeInterface::SCOPE_STORE, 'default')
]
public function testSearchCriteriaValidatorSkipsEnforcementWhenDisabled(): void
{
$field = $this->createMock(Field::class);

$this->compositeValidator->validate($field, ['pageSize' => 100]);
}
}