From b306384a3ce31883630a8295146f671f034c0e93 Mon Sep 17 00:00:00 2001 From: Elliot Cleary <135822424+elliotcleary-wpe@users.noreply.github.com> Date: Fri, 27 Feb 2026 14:03:20 +0000 Subject: [PATCH 1/3] chore: Bump symfony/process to 5.4.51 --- composer.json | 5 +++-- composer.lock | 44 +++++++++++++++++++++---------------- src/filter-query.php | 2 +- wp-graphql-filter-query.php | 5 ++++- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 4f4a776..814b22b 100644 --- a/composer.json +++ b/composer.json @@ -17,14 +17,15 @@ ], "require-dev": { "phpunit/phpunit": "^7", - "yoast/phpunit-polyfills": "^1.0", + "yoast/phpunit-polyfills": "^1.1", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/phpcompatibility-wp": "^2.1.3", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", "squizlabs/php_codesniffer": "^3.6.0", "wp-coding-standards/wpcs": "^2.3.0", "wp-graphql/wp-graphql": "^1.8", - "spatie/phpunit-watcher": "^1.23" + "spatie/phpunit-watcher": "^1.23", + "symfony/process": "5.4.51" }, "scripts": { "phpunit": "vendor/bin/phpunit", diff --git a/composer.lock b/composer.lock index 4daabd8..7a967a3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "030df503c758337b7d42828b00446f93", + "content-hash": "ec6ae315f134b7670af944818161da5c", "packages": [], "packages-dev": [ { @@ -3280,16 +3280,16 @@ }, { "name": "symfony/process", - "version": "v5.4.46", + "version": "v5.4.51", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4" + "reference": "467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/01906871cb9b5e3cf872863b91aba4ec9767daf4", - "reference": "01906871cb9b5e3cf872863b91aba4ec9767daf4", + "url": "https://api.github.com/repos/symfony/process/zipball/467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f", + "reference": "467bfc56f18f5ef6d5ccb09324d7e988c1c0a98f", "shasum": "" }, "require": { @@ -3322,7 +3322,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.46" + "source": "https://github.com/symfony/process/tree/v5.4.51" }, "funding": [ { @@ -3333,12 +3333,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-06T09:18:28+00:00" + "time": "2026-01-26T15:53:37+00:00" }, { "name": "symfony/service-contracts", @@ -3891,16 +3895,16 @@ }, { "name": "yoast/phpunit-polyfills", - "version": "1.0.3", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "5ea3536428944955f969bc764bbe09738e151ada" + "reference": "41aaac462fbd80feb8dd129e489f4bbc53fe26b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada", - "reference": "5ea3536428944955f969bc764bbe09738e151ada", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/41aaac462fbd80feb8dd129e489f4bbc53fe26b0", + "reference": "41aaac462fbd80feb8dd129e489f4bbc53fe26b0", "shasum": "" }, "require": { @@ -3908,13 +3912,14 @@ "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "yoast/yoastcs": "^2.2.0" + "php-parallel-lint/php-console-highlighter": "^1.0.0", + "php-parallel-lint/php-parallel-lint": "^1.4.0", + "yoast/yoastcs": "^3.2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev", - "dev-develop": "1.x-dev" + "dev-main": "4.x-dev" } }, "autoload": { @@ -3946,9 +3951,10 @@ ], "support": { "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", + "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2021-11-23T01:37:03+00:00" + "time": "2025-08-10T04:54:36+00:00" }, { "name": "yosymfony/resource-watcher", @@ -4010,13 +4016,13 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { "php": "7.4.23" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/src/filter-query.php b/src/filter-query.php index 2ba86e4..526dea1 100644 --- a/src/filter-query.php +++ b/src/filter-query.php @@ -168,7 +168,7 @@ private function resolve_taxonomy( array $filter_obj, int $depth ): array { * @return array */ public function apply_recursive_filter_resolver( array $query_args, AbstractConnectionResolver $connection_resolver ): array { - $args = $connection_resolver->getArgs(); + $args = $connection_resolver->get_args(); $this->max_nesting_depth = $this->get_query_depth(); if ( empty( $args['filter'] ) ) { diff --git a/wp-graphql-filter-query.php b/wp-graphql-filter-query.php index bfa264d..d8d9270 100644 --- a/wp-graphql-filter-query.php +++ b/wp-graphql-filter-query.php @@ -24,7 +24,10 @@ /** * Load files */ -require_once dirname( __DIR__ ) . '/wp-graphql/vendor/webonyx/graphql-php/src/Error/ClientAware.php'; +// Load composer autoloader for dependencies +if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) { + require_once __DIR__ . '/vendor/autoload.php'; +} require_once __DIR__ . '/src/aggregate-query.php'; require_once __DIR__ . '/src/filter-exception.php'; From d35e75187c92376ba18b946badd7429eabd714a3 Mon Sep 17 00:00:00 2001 From: Elliot Cleary <135822424+elliotcleary-wpe@users.noreply.github.com> Date: Fri, 27 Feb 2026 17:01:29 +0000 Subject: [PATCH 2/3] refactor: revert autoloader change --- wp-graphql-filter-query.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wp-graphql-filter-query.php b/wp-graphql-filter-query.php index d8d9270..bfa264d 100644 --- a/wp-graphql-filter-query.php +++ b/wp-graphql-filter-query.php @@ -24,10 +24,7 @@ /** * Load files */ -// Load composer autoloader for dependencies -if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) { - require_once __DIR__ . '/vendor/autoload.php'; -} +require_once dirname( __DIR__ ) . '/wp-graphql/vendor/webonyx/graphql-php/src/Error/ClientAware.php'; require_once __DIR__ . '/src/aggregate-query.php'; require_once __DIR__ . '/src/filter-exception.php'; From ea56b13ba859bcbed6990489dc0226a425853492 Mon Sep 17 00:00:00 2001 From: Elliot Cleary <135822424+elliotcleary-wpe@users.noreply.github.com> Date: Mon, 2 Mar 2026 11:03:47 +0000 Subject: [PATCH 3/3] refactor: remove symfony from composer.json --- composer.json | 5 ++--- composer.lock | 19 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 814b22b..4f4a776 100644 --- a/composer.json +++ b/composer.json @@ -17,15 +17,14 @@ ], "require-dev": { "phpunit/phpunit": "^7", - "yoast/phpunit-polyfills": "^1.1", + "yoast/phpunit-polyfills": "^1.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/phpcompatibility-wp": "^2.1.3", "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2", "squizlabs/php_codesniffer": "^3.6.0", "wp-coding-standards/wpcs": "^2.3.0", "wp-graphql/wp-graphql": "^1.8", - "spatie/phpunit-watcher": "^1.23", - "symfony/process": "5.4.51" + "spatie/phpunit-watcher": "^1.23" }, "scripts": { "phpunit": "vendor/bin/phpunit", diff --git a/composer.lock b/composer.lock index 7a967a3..93bcae7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ec6ae315f134b7670af944818161da5c", + "content-hash": "ea2f80ee508f925862685e62334edec0", "packages": [], "packages-dev": [ { @@ -3895,16 +3895,16 @@ }, { "name": "yoast/phpunit-polyfills", - "version": "1.1.5", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "41aaac462fbd80feb8dd129e489f4bbc53fe26b0" + "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/41aaac462fbd80feb8dd129e489f4bbc53fe26b0", - "reference": "41aaac462fbd80feb8dd129e489f4bbc53fe26b0", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/3b59adeef77fb1c03ff5381dbb9d68b0aaff3171", + "reference": "3b59adeef77fb1c03ff5381dbb9d68b0aaff3171", "shasum": "" }, "require": { @@ -3912,14 +3912,12 @@ "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "php-parallel-lint/php-console-highlighter": "^1.0.0", - "php-parallel-lint/php-parallel-lint": "^1.4.0", - "yoast/yoastcs": "^3.2.0" + "yoast/yoastcs": "^2.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "4.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -3951,10 +3949,9 @@ ], "support": { "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", - "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2025-08-10T04:54:36+00:00" + "time": "2023-03-30T23:39:05+00:00" }, { "name": "yosymfony/resource-watcher",