cloudcreativity · lindyhopchris · Mar 9, 2024 · Mar 6, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+### Removed
+
+- **BREAKING** The following deprecated interfaces have been removed:
+    - `Bus\CommandInterface` use `Toolkit\Messages\CommandInterface` instead.
+    - `Bus\QueryInterface` use `Toolkit\Messages\QueryInterface` instead.
+    - `Bus\DispatchThroughMiddleware` use `Toolkit\Messages\DispatchThroughMiddleware` instead.
+    - `Infrastructure\Log\ContextProviderInterface` use `Toolkit\Loggable\ContextProviderInterface` instead.
+
 ## [1.0.0-rc.2] - 2024-03-06
 
 ### Added
@@ -74,7 +82,8 @@ All notable changes to this project will be documented in this file. This projec
 - New `DeferredDispatcher` class for dispatching domain events when not using a unit of work.
 - New UUID factory interface and class, that wraps the `ramsey/uuid` factory to return UUID identifiers.
 - GUIDs that wrap UUIDs can now be created via the static `Guid::fromUuid()` method.
-- New `SetupBeforeDispatch` and `TearDownAfterDispatch` bus middleware, that can be used either to setup (and optionally
+- New `SetupBeforeDispatch` and `TearDownAfterDispatch` bus middleware, that can be used either to set up (and
+  optionally
   tear down) application state around the dispatching of a message, or to just do tear down work.
 - The `EventBus` namespace now has a working implementation for publishing integration events.
 - Can now provide a closure to the `ListOfErrorsInterface::first()` method to find the first matching error.
@@ -131,7 +140,7 @@ All notable changes to this project will be documented in this file. This projec
 - All constructor arguments for the `Toolkit\Result\Error` object are now optional. This allows named arguments to be
   used when creating an error object.
 - The `Toolkit\Result\Error` object can now accept only a code, previously it had to have a message.
-- The following interfaces no longer extend the log `ContextProviderInterface`. Instead classes only need to implement
+- The following interfaces no longer extend the log `ContextProviderInterface`. Instead, classes only need to implement
   that log interface if they need to customise how that class is logged.
     - `Bus\MessageInterface`
     - `Infrastructure\Queue\QueueableInterface`

diff --git a/src/Bus/CommandInterface.php b/src/Bus/CommandInterface.php
diff --git a/src/Bus/DispatchThroughMiddleware.php b/src/Bus/DispatchThroughMiddleware.php
diff --git a/src/Bus/QueryInterface.php b/src/Bus/QueryInterface.php
diff --git a/src/Infrastructure/Log/ContextProviderInterface.php b/src/Infrastructure/Log/ContextProviderInterface.php
diff --git a/tests/Unit/Bus/TestCommand.php b/tests/Unit/Bus/TestCommand.php
@@ -11,7 +11,7 @@
 
 namespace CloudCreativity\Modules\Tests\Unit\Bus;
 
-use CloudCreativity\Modules\Bus\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 
 class TestCommand implements CommandInterface
 {

diff --git a/tests/Unit/Bus/TestCommandHandler.php b/tests/Unit/Bus/TestCommandHandler.php
@@ -11,7 +11,7 @@
 
 namespace CloudCreativity\Modules\Tests\Unit\Bus;
 
-use CloudCreativity\Modules\Bus\DispatchThroughMiddleware;
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
 use CloudCreativity\Modules\Toolkit\Result\Result;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 

diff --git a/tests/Unit/Bus/TestQuery.php b/tests/Unit/Bus/TestQuery.php
@@ -11,7 +11,7 @@
 
 namespace CloudCreativity\Modules\Tests\Unit\Bus;
 
-use CloudCreativity\Modules\Bus\QueryInterface;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 
 class TestQuery implements QueryInterface
 {

diff --git a/tests/Unit/Bus/TestQueryHandler.php b/tests/Unit/Bus/TestQueryHandler.php
@@ -11,7 +11,7 @@
 
 namespace CloudCreativity\Modules\Tests\Unit\Bus;
 
-use CloudCreativity\Modules\Bus\DispatchThroughMiddleware;
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
 use CloudCreativity\Modules\Toolkit\Result\Result;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 

diff --git a/tests/Unit/Infrastructure/Log/ResultContextTest.php b/tests/Unit/Infrastructure/Log/ResultContextTest.php
@@ -12,7 +12,6 @@
 namespace CloudCreativity\Modules\Tests\Unit\Infrastructure\Log;
 
 use BackedEnum;
-use CloudCreativity\Modules\Infrastructure\Log\ContextProviderInterface as DeprecatedContextProviderInterface;
 use CloudCreativity\Modules\Infrastructure\Log\ResultContext;
 use CloudCreativity\Modules\Toolkit\Identifiers\IdentifierInterface;
 use CloudCreativity\Modules\Toolkit\Loggable\ContextProviderInterface;
@@ -25,11 +24,11 @@
 /**
  * @extends ResultInterface<null>
  */
-interface ResultWithContext extends ResultInterface, DeprecatedContextProviderInterface
+interface ResultWithContext extends ResultInterface, ContextProviderInterface
 {
 }
 
-interface ErrorWithContext extends ErrorInterface, DeprecatedContextProviderInterface
+interface ErrorWithContext extends ErrorInterface, ContextProviderInterface
 {
 }