From 74f25ecc0e6783ecc6677843713ee3c451364e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Pelhate?= Date: Tue, 18 Aug 2026 14:36:52 +0200 Subject: [PATCH 1/2] Move enum test doubles --- .../Doubles/Enums => Doubles/Enum}/IntBackedEnum.php | 2 +- .../Doubles/Enums => Doubles/Enum}/StringBackedEnum.php | 2 +- src/{PHPUnit/Doubles/Enums => Doubles/Enum}/UnitEnum.php | 2 +- src/PHPUnit/DataProviders/EnumCaseTest.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/{PHPUnit/Doubles/Enums => Doubles/Enum}/IntBackedEnum.php (72%) rename src/{PHPUnit/Doubles/Enums => Doubles/Enum}/StringBackedEnum.php (75%) rename src/{PHPUnit/Doubles/Enums => Doubles/Enum}/UnitEnum.php (67%) diff --git a/src/PHPUnit/Doubles/Enums/IntBackedEnum.php b/src/Doubles/Enum/IntBackedEnum.php similarity index 72% rename from src/PHPUnit/Doubles/Enums/IntBackedEnum.php rename to src/Doubles/Enum/IntBackedEnum.php index b6573d7..7235814 100644 --- a/src/PHPUnit/Doubles/Enums/IntBackedEnum.php +++ b/src/Doubles/Enum/IntBackedEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles\Enums; +namespace Craftzing\TestBench\Doubles\Enum; enum IntBackedEnum: int { diff --git a/src/PHPUnit/Doubles/Enums/StringBackedEnum.php b/src/Doubles/Enum/StringBackedEnum.php similarity index 75% rename from src/PHPUnit/Doubles/Enums/StringBackedEnum.php rename to src/Doubles/Enum/StringBackedEnum.php index 50e6c2d..96b1dac 100644 --- a/src/PHPUnit/Doubles/Enums/StringBackedEnum.php +++ b/src/Doubles/Enum/StringBackedEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles\Enums; +namespace Craftzing\TestBench\Doubles\Enum; enum StringBackedEnum: string { diff --git a/src/PHPUnit/Doubles/Enums/UnitEnum.php b/src/Doubles/Enum/UnitEnum.php similarity index 67% rename from src/PHPUnit/Doubles/Enums/UnitEnum.php rename to src/Doubles/Enum/UnitEnum.php index 6bd24fb..3a88c3d 100644 --- a/src/PHPUnit/Doubles/Enums/UnitEnum.php +++ b/src/Doubles/Enum/UnitEnum.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles\Enums; +namespace Craftzing\TestBench\Doubles\Enum; enum UnitEnum { diff --git a/src/PHPUnit/DataProviders/EnumCaseTest.php b/src/PHPUnit/DataProviders/EnumCaseTest.php index 7568dc3..b9829f9 100644 --- a/src/PHPUnit/DataProviders/EnumCaseTest.php +++ b/src/PHPUnit/DataProviders/EnumCaseTest.php @@ -4,9 +4,9 @@ namespace Craftzing\TestBench\PHPUnit\DataProviders; -use Craftzing\TestBench\PHPUnit\Doubles\Enums\IntBackedEnum; -use Craftzing\TestBench\PHPUnit\Doubles\Enums\StringBackedEnum; -use Craftzing\TestBench\PHPUnit\Doubles\Enums\UnitEnum; +use Craftzing\TestBench\Doubles\Enum\IntBackedEnum; +use Craftzing\TestBench\Doubles\Enum\StringBackedEnum; +use Craftzing\TestBench\Doubles\Enum\UnitEnum; use Faker\Factory; use Faker\Generator; use Illuminate\Support\Arr; From 2b40273dea3821209bdc96ec0d2fce08ff1cf307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81mi=20Pelhate?= Date: Tue, 18 Aug 2026 14:40:28 +0200 Subject: [PATCH 2/2] Move callable test doubles --- .../Doubles => Doubles/Callable}/CallableInvocation.php | 2 +- src/Doubles/{ => Callable}/FalsyCallback.php | 2 +- src/Doubles/{ => Callable}/ShouldNotBeCalled.php | 2 +- src/{PHPUnit/Doubles => Doubles/Callable}/SpyCallable.php | 2 +- src/{PHPUnit/Doubles => Doubles/Callable}/SpyCallableTest.php | 2 +- src/Doubles/{ => Callable}/TruthyCallback.php | 2 +- src/Laravel/Constraint/Bus/HasHandlerTest.php | 2 +- src/Laravel/Constraint/Bus/WasHandled.php | 2 +- src/Laravel/Constraint/Bus/WasHandledTest.php | 2 +- src/PHPUnit/Constraint/Callables/WasCalled.php | 4 ++-- src/PHPUnit/Constraint/Callables/WasCalledTest.php | 2 +- .../Objects/DeriveConstraintsFromObjectUsingFakes.php | 2 +- src/PHPUnit/Constraint/Spy.php | 2 +- src/PHPUnit/DataProviders/QuantableConstraintTest.php | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) rename src/{PHPUnit/Doubles => Doubles/Callable}/CallableInvocation.php (84%) rename src/Doubles/{ => Callable}/FalsyCallback.php (75%) rename src/Doubles/{ => Callable}/ShouldNotBeCalled.php (82%) rename src/{PHPUnit/Doubles => Doubles/Callable}/SpyCallable.php (94%) rename src/{PHPUnit/Doubles => Doubles/Callable}/SpyCallableTest.php (97%) rename src/Doubles/{ => Callable}/TruthyCallback.php (75%) diff --git a/src/PHPUnit/Doubles/CallableInvocation.php b/src/Doubles/Callable/CallableInvocation.php similarity index 84% rename from src/PHPUnit/Doubles/CallableInvocation.php rename to src/Doubles/Callable/CallableInvocation.php index 7b965f2..80086fd 100644 --- a/src/PHPUnit/Doubles/CallableInvocation.php +++ b/src/Doubles/Callable/CallableInvocation.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; final readonly class CallableInvocation { diff --git a/src/Doubles/FalsyCallback.php b/src/Doubles/Callable/FalsyCallback.php similarity index 75% rename from src/Doubles/FalsyCallback.php rename to src/Doubles/Callable/FalsyCallback.php index 6052bc6..a063ec4 100644 --- a/src/Doubles/FalsyCallback.php +++ b/src/Doubles/Callable/FalsyCallback.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; final readonly class FalsyCallback { diff --git a/src/Doubles/ShouldNotBeCalled.php b/src/Doubles/Callable/ShouldNotBeCalled.php similarity index 82% rename from src/Doubles/ShouldNotBeCalled.php rename to src/Doubles/Callable/ShouldNotBeCalled.php index d99fb93..4620c76 100644 --- a/src/Doubles/ShouldNotBeCalled.php +++ b/src/Doubles/Callable/ShouldNotBeCalled.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; use LogicException; diff --git a/src/PHPUnit/Doubles/SpyCallable.php b/src/Doubles/Callable/SpyCallable.php similarity index 94% rename from src/PHPUnit/Doubles/SpyCallable.php rename to src/Doubles/Callable/SpyCallable.php index a67af29..d44bfe3 100644 --- a/src/PHPUnit/Doubles/SpyCallable.php +++ b/src/Doubles/Callable/SpyCallable.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; use Craftzing\TestBench\PHPUnit\AssertsConstraints; diff --git a/src/PHPUnit/Doubles/SpyCallableTest.php b/src/Doubles/Callable/SpyCallableTest.php similarity index 97% rename from src/PHPUnit/Doubles/SpyCallableTest.php rename to src/Doubles/Callable/SpyCallableTest.php index bb663df..4948a4c 100644 --- a/src/PHPUnit/Doubles/SpyCallableTest.php +++ b/src/Doubles/Callable/SpyCallableTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\PHPUnit\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Test; diff --git a/src/Doubles/TruthyCallback.php b/src/Doubles/Callable/TruthyCallback.php similarity index 75% rename from src/Doubles/TruthyCallback.php rename to src/Doubles/Callable/TruthyCallback.php index 52d0ba6..12249d9 100644 --- a/src/Doubles/TruthyCallback.php +++ b/src/Doubles/Callable/TruthyCallback.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Craftzing\TestBench\Doubles; +namespace Craftzing\TestBench\Doubles\Callable; final readonly class TruthyCallback { diff --git a/src/Laravel/Constraint/Bus/HasHandlerTest.php b/src/Laravel/Constraint/Bus/HasHandlerTest.php index 61d3d4f..6c63253 100644 --- a/src/Laravel/Constraint/Bus/HasHandlerTest.php +++ b/src/Laravel/Constraint/Bus/HasHandlerTest.php @@ -4,7 +4,7 @@ namespace Craftzing\TestBench\Laravel\Constraint\Bus; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Illuminate\Support\Facades\Bus; use InvalidArgumentException; use Orchestra\Testbench\TestCase; diff --git a/src/Laravel/Constraint/Bus/WasHandled.php b/src/Laravel/Constraint/Bus/WasHandled.php index fa813e8..1fbf25b 100644 --- a/src/Laravel/Constraint/Bus/WasHandled.php +++ b/src/Laravel/Constraint/Bus/WasHandled.php @@ -4,11 +4,11 @@ namespace Craftzing\TestBench\Laravel\Constraint\Bus; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Craftzing\TestBench\PHPUnit\Constraint\Callables\WasCalled; use Craftzing\TestBench\PHPUnit\Constraint\Objects\DerivesConstraintsFromObjects; use Craftzing\TestBench\PHPUnit\Constraint\ProvidesAdditionalFailureDescription; use Craftzing\TestBench\PHPUnit\Constraint\Quantable; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Contracts\Container\Container; use Illuminate\Support\Traits\ReflectsClosures; diff --git a/src/Laravel/Constraint/Bus/WasHandledTest.php b/src/Laravel/Constraint/Bus/WasHandledTest.php index e3f4bae..f5c2a74 100644 --- a/src/Laravel/Constraint/Bus/WasHandledTest.php +++ b/src/Laravel/Constraint/Bus/WasHandledTest.php @@ -4,13 +4,13 @@ namespace Craftzing\TestBench\Laravel\Constraint\Bus; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Craftzing\TestBench\PHPUnit\Constraint\Callables\Assertions\WithSameArguments; use Craftzing\TestBench\PHPUnit\Constraint\Callables\WasCalled; use Craftzing\TestBench\PHPUnit\Constraint\Objects\DeriveConstraintsFromObjectUsingFakes; use Craftzing\TestBench\PHPUnit\Constraint\Objects\DeriveConstraintsFromObjectUsingReflection; use Craftzing\TestBench\PHPUnit\Constraint\Spy; use Craftzing\TestBench\PHPUnit\DataProviders\QuantableConstraint; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; use Illuminate\Support\Facades\Bus; use InvalidArgumentException; use LogicException; diff --git a/src/PHPUnit/Constraint/Callables/WasCalled.php b/src/PHPUnit/Constraint/Callables/WasCalled.php index 3ddb02d..6b73478 100644 --- a/src/PHPUnit/Constraint/Callables/WasCalled.php +++ b/src/PHPUnit/Constraint/Callables/WasCalled.php @@ -4,10 +4,10 @@ namespace Craftzing\TestBench\PHPUnit\Constraint\Callables; +use Craftzing\TestBench\Doubles\Callable\CallableInvocation; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Craftzing\TestBench\PHPUnit\Constraint\ProvidesAdditionalFailureDescription; use Craftzing\TestBench\PHPUnit\Constraint\Quantable; -use Craftzing\TestBench\PHPUnit\Doubles\CallableInvocation; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; use InvalidArgumentException; use Override; use PHPUnit\Framework\Constraint\Constraint; diff --git a/src/PHPUnit/Constraint/Callables/WasCalledTest.php b/src/PHPUnit/Constraint/Callables/WasCalledTest.php index b1645da..f45eeb1 100644 --- a/src/PHPUnit/Constraint/Callables/WasCalledTest.php +++ b/src/PHPUnit/Constraint/Callables/WasCalledTest.php @@ -4,8 +4,8 @@ namespace Craftzing\TestBench\PHPUnit\Constraint\Callables; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Craftzing\TestBench\PHPUnit\DataProviders\QuantableConstraint; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; use InvalidArgumentException; use PHPUnit\Framework\Attributes\DataProviderExternal; use PHPUnit\Framework\Attributes\Test; diff --git a/src/PHPUnit/Constraint/Objects/DeriveConstraintsFromObjectUsingFakes.php b/src/PHPUnit/Constraint/Objects/DeriveConstraintsFromObjectUsingFakes.php index 37d8eb7..867ef5a 100644 --- a/src/PHPUnit/Constraint/Objects/DeriveConstraintsFromObjectUsingFakes.php +++ b/src/PHPUnit/Constraint/Objects/DeriveConstraintsFromObjectUsingFakes.php @@ -4,7 +4,7 @@ namespace Craftzing\TestBench\PHPUnit\Constraint\Objects; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use PHPUnit\Framework\Constraint\Callback; final readonly class DeriveConstraintsFromObjectUsingFakes implements DeriveConstraintsFromObject diff --git a/src/PHPUnit/Constraint/Spy.php b/src/PHPUnit/Constraint/Spy.php index e7e9378..de646e7 100644 --- a/src/PHPUnit/Constraint/Spy.php +++ b/src/PHPUnit/Constraint/Spy.php @@ -4,7 +4,7 @@ namespace Craftzing\TestBench\PHPUnit\Constraint; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use PHPUnit\Framework\Constraint\Constraint; final class Spy extends Constraint diff --git a/src/PHPUnit/DataProviders/QuantableConstraintTest.php b/src/PHPUnit/DataProviders/QuantableConstraintTest.php index 9d4cef2..a6ba765 100644 --- a/src/PHPUnit/DataProviders/QuantableConstraintTest.php +++ b/src/PHPUnit/DataProviders/QuantableConstraintTest.php @@ -4,10 +4,10 @@ namespace Craftzing\TestBench\PHPUnit\DataProviders; +use Craftzing\TestBench\Doubles\Callable\SpyCallable; use Craftzing\TestBench\PHPUnit\Constraint\Callables\Assertions\WithSameArguments; use Craftzing\TestBench\PHPUnit\Constraint\Callables\WasCalled; use Craftzing\TestBench\PHPUnit\Constraint\Quantable; -use Craftzing\TestBench\PHPUnit\Doubles\SpyCallable; use Faker\Factory; use Faker\Generator; use Illuminate\Support\Collection;