Skip to content

Fix CI: update Symfony and PSR cache dependencies for no-framework example, make static analysis happy with possible types of callback params #811

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
andrew-demb wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −7
Open

Fix CI: update Symfony and PSR cache dependencies for no-framework example, make static analysis happy with possible types of callback params #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4057dfb
Update Symfony and PSR cache dependencies for no-framework example
andrew-demb Jun 9, 2026
1b34161
Fix validation rule callback typing
andrew-demb Jun 9, 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
4 changes: 2 additions & 2 deletions examples/no-framework/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"require": {
"thecodingmachine/graphqlite": "@dev",
"mouf/picotainer": "^1.1",
"symfony/cache": "^4.3",
"psr/simple-cache": "^1.0"
"symfony/cache": "^8.1",
"psr/simple-cache": "^3.0"
},
"repositories": [
{
Expand Down
16 changes: 11 additions & 5 deletions src/Http/Psr15GraphQLMiddlewareBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

use DateInterval;
use GraphQL\Error\DebugFlag;
use GraphQL\Language\AST\DocumentNode;
use GraphQL\Server\OperationParams;
use GraphQL\Server\ServerConfig;
use GraphQL\Type\Schema;
use GraphQL\Validator\DocumentValidator;
Expand Down Expand Up @@ -133,13 +135,17 @@ public function createMiddleware(): MiddlewareInterface
// So if we only added given rule, all of the default rules would not be validated, so we must also provide them.
$originalValidationRules = $this->config->getValidationRules() ?? DocumentValidator::allRules();

$this->config->setValidationRules(function (...$args) use ($originalValidationRules) {
if (is_callable($originalValidationRules)) {
$originalValidationRules = $originalValidationRules(...$args);
}
$this->config->setValidationRules(function (
OperationParams $operation,
DocumentNode $doc,
string $operationType,
) use ($originalValidationRules): array {
$validationRules = is_callable($originalValidationRules)
? $originalValidationRules($operation, $doc, $operationType)
: $originalValidationRules;

return [
...$originalValidationRules,
...$validationRules,
...$this->addedValidationRules,
];
});
Expand Down
Loading