From 62a9a78ee293c69e6bb688c3c8b0018357dd8a6f Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Mon, 11 Mar 2024 18:05:37 +0000 Subject: [PATCH] chore: bumps dependencies --- composer.json | 10 ++++---- overrides/TextUI/TestSuiteFilterProcessor.php | 23 ++++++++----------- src/Bootstrappers/BootOverrides.php | 2 +- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index 029aeba0..b1d6b742 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ "require": { "php": "^8.1.0", "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.1.0", - "nunomaduro/termwind": "^1.15.1|^2.0.0", + "nunomaduro/collision": "^7.10.0|^8.1.1", + "nunomaduro/termwind": "^1.15.1|^2.0.1", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.7.0", - "phpunit/phpunit": "^10.5.11" + "phpunit/phpunit": "^10.5.12" }, "conflict": { - "phpunit/phpunit": ">10.5.11", + "phpunit/phpunit": ">10.5.12", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, @@ -52,7 +52,7 @@ }, "require-dev": { "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.0", + "pestphp/pest-plugin-type-coverage": "^2.8.1", "symfony/process": "^6.4.0|^7.0.4" }, "minimum-stability": "dev", diff --git a/overrides/TextUI/TestSuiteFilterProcessor.php b/overrides/TextUI/TestSuiteFilterProcessor.php index f4473289..52317e81 100644 --- a/overrides/TextUI/TestSuiteFilterProcessor.php +++ b/overrides/TextUI/TestSuiteFilterProcessor.php @@ -59,19 +59,14 @@ use function array_map; */ final class TestSuiteFilterProcessor { - private Factory $filterFactory; - - public function __construct(Factory $factory = new Factory) - { - $this->filterFactory = $factory; - } - /** * @throws Event\RuntimeException * @throws FilterNotConfiguredException */ public function process(Configuration $configuration, TestSuite $suite): void { + $factory = new Factory; + if (! $configuration->hasFilter() && ! $configuration->hasGroups() && ! $configuration->hasExcludeGroups() && @@ -83,21 +78,21 @@ final class TestSuiteFilterProcessor } if ($configuration->hasExcludeGroups()) { - $this->filterFactory->addExcludeGroupFilter( + $factory->addExcludeGroupFilter( $configuration->excludeGroups() ); } if (Only::isEnabled()) { - $this->filterFactory->addIncludeGroupFilter(['__pest_only']); + $factory->addIncludeGroupFilter(['__pest_only']); } elseif ($configuration->hasGroups()) { - $this->filterFactory->addIncludeGroupFilter( + $factory->addIncludeGroupFilter( $configuration->groups() ); } if ($configuration->hasTestsCovering()) { - $this->filterFactory->addIncludeGroupFilter( + $factory->addIncludeGroupFilter( array_map( static fn (string $name): string => '__phpunit_covers_'.$name, $configuration->testsCovering() @@ -106,7 +101,7 @@ final class TestSuiteFilterProcessor } if ($configuration->hasTestsUsing()) { - $this->filterFactory->addIncludeGroupFilter( + $factory->addIncludeGroupFilter( array_map( static fn (string $name): string => '__phpunit_uses_'.$name, $configuration->testsUsing() @@ -115,12 +110,12 @@ final class TestSuiteFilterProcessor } if ($configuration->hasFilter()) { - $this->filterFactory->addNameFilter( + $factory->addNameFilter( $configuration->filter() ); } - $suite->injectFilter($this->filterFactory); + $suite->injectFilter($factory); Event\Facade::emitter()->testSuiteFiltered( Event\TestSuite\TestSuiteBuilder::from($suite) diff --git a/src/Bootstrappers/BootOverrides.php b/src/Bootstrappers/BootOverrides.php index bf4f53ff..e4c9899e 100644 --- a/src/Bootstrappers/BootOverrides.php +++ b/src/Bootstrappers/BootOverrides.php @@ -23,7 +23,7 @@ final class BootOverrides implements Bootstrapper 'bc8718c89264f65800beabc23e51c6d3bcff87dfc764a12179ef5dbfde272c8b' => 'Runner/TestSuiteLoader.php', 'f41e48d6cb546772a7de4f8e66b6b7ce894a5318d063eb52e354d206e96c701c' => 'TextUI/Command/Commands/WarmCodeCoverageCacheCommand.php', 'cb7519f2d82893640b694492cf7ec9528da80773cc1d259634181b5d393528b5' => 'TextUI/Output/Default/ProgressPrinter/Subscriber/TestSkippedSubscriber.php', - '6db25ee539e9b12b1fb4e044a0a93410e015bc983ecdd3909cd394fe44ae8c95' => 'TextUI/TestSuiteFilterProcessor.php', + '2f06e4b1a9f3a24145bfc7ea25df4f124117f940a2cde30a04d04d5678006bff' => 'TextUI/TestSuiteFilterProcessor.php', 'ef64a657ed9c0067791483784944107827bf227c7e3200f212b6751876b99e25' => 'Event/Value/ThrowableBuilder.php', 'c78f96e34b98ed01dd8106539d59b8aa8d67f733274118b827c01c5c4111c033' => 'Logging/JUnit/JunitXmlLogger.php', ];