Merge branch 'release/1.0.0-rc.1'

.editorconfig

@@ -8,5 +8,5 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_size = 4
 
-[*.{md,yml}]
+[*.{md,yml,yaml}]
 indent_size = 2

.gitattributes

@@ -1,4 +1,5 @@
 /tests export-ignore
+/.github export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore

CHANGELOG.md

@@ -5,6 +5,41 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [1.0.0-rc.1] - 2024-02-23
+
+### Added
+
+- New event bus notifier implementation that was previously missing. This completes the event bus implementation.
+- New message interfaces (command, query, integration event) added to the toolkit.
+- New loggable context provider interface added to the toolkit.
+- Module basename now supports namespaces where an application only has a single bounded context.
+
+### Changed
+
+- **BREAKING** Moved the following interfaces to the `Toolkit\Messages` namespace:
+    - `MessageInterface`
+    - `IntegrationEventInterface`
+- **BREAKING** Interfaces that type-hinted `Bus\CommandInterface`, `Bus\QueryInterface` or `Bus\MessageInterface` now
+  type-hint the new interfaces in the `Toolkit\Messages` namespace.
+- **BREAKING** Moved the `EventBus` implementation from `Infrastructure\EventBus` to `EventBus`. In Deptrac, this
+  namespace is now part of the _Application Bus_ layer. Renamed the publisher handler and publisher handler containers
+  to integration event handler and container - so that they can be used for both the publisher and notifier
+  implementations.
+- **BREAKING** Removed the `EventBus\PublishThroughMiddleware` interface. Use the
+  `Toolkit\Messages\DispatchThroughMiddleware` interface instead.
+
+### Removed
+
+- **BREAKING** removed the `deptrac-layers.yaml` file, in favour of applications including the classes in their own
+   Deptrac configuration.
+
+### Deprecated
+
+- The `Bus\CommandInterface`, `Bus\QueryInterface` and `Bus\DispatchThroughMiddleware` interfaces have been deprecated
+  in favour of the new interfaces in the `Toolkit\Messages` namespace.
+- The `Infrastructure\Log\ContextProviderInterface` is deprecated in favour of the new
+  `Toolkit\Loggable\ContextProviderInterface` interface.
+
 ## [0.6.1] - 2024-02-09
 
 ### Fixed

deptrac.yaml

@@ -1,28 +1,37 @@
-imports:
-  - deptrac-layers.yaml
 deptrac:
   paths:
     - ./src
   layers:
-    - name: PSR Log
+    - name: Toolkit
       collectors:
         - type: className
-          value: Psr\\Log.*
-    - name: Ramsey UUID
+          value: CloudCreativity\\Modules\\Toolkit\\*
+        - type: className
+          value: Ramsey\\Uuid\\*
+    - name: Domain
+      collectors:
+        - type: className
+          value: CloudCreativity\\Modules\\Domain\\*
+    - name: Infrastructure
       collectors:
         - type: className
-          value: Ramsey\\Uuid.*
+          value: CloudCreativity\\Modules\\Infrastructure\\*
+        - type: className
+          value: Psr\\Log\\*
+    - name: Application
+      collectors:
+        - type: className
+          value: CloudCreativity\\Modules\\Bus\\*
+        - type: className
+          value: CloudCreativity\\Modules\\EventBus\\*
   ruleset:
     Toolkit:
-      - Ramsey UUID
-    Application Bus:
+    Domain:
       - Toolkit
-      - Infrastructure (Common)
-      - PSR Log
-    Domain (Common):
+    Infrastructure:
       - Toolkit
-    Infrastructure (Common):
+      - Domain
+    Application:
       - Toolkit
-      - Domain (Common)
-      - Ramsey UUID
-      - PSR Log
+      - Domain
+      - Infrastructure

src/Bus/CommandDispatcher.php

@@ -19,6 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Pipeline\MiddlewareProcessor;
 use CloudCreativity\Modules\Toolkit\Pipeline\PipeContainerInterface;
 use CloudCreativity\Modules\Toolkit\Pipeline\PipelineBuilderFactory;

src/Bus/CommandDispatcherInterface.php

@@ -19,6 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface CommandDispatcherInterface

src/Bus/CommandHandler.php

@@ -19,6 +19,8 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 final class CommandHandler implements CommandHandlerInterface

src/Bus/CommandHandlerInterface.php

@@ -19,6 +19,8 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface CommandHandlerInterface extends DispatchThroughMiddleware

src/Bus/CommandInterface.php

@@ -19,6 +19,11 @@
 
 namespace CloudCreativity\Modules\Bus;
 
-interface CommandInterface extends MessageInterface
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface as BaseInterface;
+
+/**
+ * @deprecated 1.0.0 Use CloudCreativity\Modules\Toolkit\Messages\CommandInterface
+ */
+interface CommandInterface extends BaseInterface
 {
 }

src/Bus/DispatchThroughMiddleware.php

@@ -19,12 +19,11 @@
 
 namespace CloudCreativity\Modules\Bus;
 
-interface DispatchThroughMiddleware
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware as BaseDispatchThroughMiddleware;
+
+/**
+ * @deprecated 1.0.0 use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware
+ */
+interface DispatchThroughMiddleware extends BaseDispatchThroughMiddleware
 {
-    /**
-     * Get the middleware for the command or query.
-     *
-     * @return array<callable|string>
-     */
-    public function middleware(): array;
 }

src/Bus/Middleware/CommandMiddlewareInterface.php

@@ -20,7 +20,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface CommandMiddlewareInterface

src/Bus/Middleware/ExecuteInUnitOfWork.php

@@ -20,8 +20,8 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\CommandInterface;
 use CloudCreativity\Modules\Infrastructure\Persistence\UnitOfWorkManagerInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 final class ExecuteInUnitOfWork implements CommandMiddlewareInterface

src/Bus/Middleware/FlushDeferredEvents.php

@@ -20,8 +20,8 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\MessageInterface;
 use CloudCreativity\Modules\Infrastructure\DomainEventDispatching\DeferredDispatcherInterface;
+use CloudCreativity\Modules\Toolkit\Messages\MessageInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 use Throwable;
 

src/Bus/Middleware/LogMessageDispatch.php

@@ -20,9 +20,9 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\MessageInterface;
 use CloudCreativity\Modules\Infrastructure\Log\ObjectContext;
 use CloudCreativity\Modules\Infrastructure\Log\ResultContext;
+use CloudCreativity\Modules\Toolkit\Messages\MessageInterface;
 use CloudCreativity\Modules\Toolkit\ModuleBasename;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 use Psr\Log\LoggerInterface;

src/Bus/Middleware/MessageMiddlewareInterface.php

@@ -20,7 +20,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\MessageInterface;
+use CloudCreativity\Modules\Toolkit\Messages\MessageInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface MessageMiddlewareInterface

src/Bus/Middleware/QueryMiddlewareInterface.php

@@ -20,7 +20,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\QueryInterface;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface QueryMiddlewareInterface

src/Bus/Middleware/SetupBeforeDispatch.php

@@ -20,7 +20,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\MessageInterface;
+use CloudCreativity\Modules\Toolkit\Messages\MessageInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 final class SetupBeforeDispatch implements MessageMiddlewareInterface

src/Bus/Middleware/TearDownAfterDispatch.php

@@ -20,7 +20,7 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\MessageInterface;
+use CloudCreativity\Modules\Toolkit\Messages\MessageInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 final class TearDownAfterDispatch implements MessageMiddlewareInterface

src/Bus/Middleware/ValidateCommand.php

@@ -20,8 +20,8 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\CommandInterface;
 use CloudCreativity\Modules\Bus\Validation\CommandValidatorInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\Result;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 

src/Bus/Middleware/ValidateQuery.php

@@ -20,8 +20,8 @@
 namespace CloudCreativity\Modules\Bus\Middleware;
 
 use Closure;
-use CloudCreativity\Modules\Bus\QueryInterface;
 use CloudCreativity\Modules\Bus\Validation\QueryValidatorInterface;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\Result;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 

src/Bus/QueryDispatcher.php

@@ -19,6 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Pipeline\MiddlewareProcessor;
 use CloudCreativity\Modules\Toolkit\Pipeline\PipeContainerInterface;
 use CloudCreativity\Modules\Toolkit\Pipeline\PipelineBuilderFactory;

src/Bus/QueryDispatcherInterface.php

@@ -19,6 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface QueryDispatcherInterface

src/Bus/QueryHandler.php

@@ -19,6 +19,8 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 final class QueryHandler implements QueryHandlerInterface

src/Bus/QueryHandlerInterface.php

@@ -19,6 +19,8 @@
 
 namespace CloudCreativity\Modules\Bus;
 
+use CloudCreativity\Modules\Toolkit\Messages\DispatchThroughMiddleware;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ResultInterface;
 
 interface QueryHandlerInterface extends DispatchThroughMiddleware

src/Bus/QueryInterface.php

@@ -19,6 +19,11 @@
 
 namespace CloudCreativity\Modules\Bus;
 
-interface QueryInterface extends MessageInterface
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface as BaseInterface;
+
+/**
+ * @deprecated 1.0.0 Use CloudCreativity\Modules\Toolkit\Messages\QueryInterface
+ */
+interface QueryInterface extends BaseInterface
 {
 }

src/Bus/Validation/CommandValidator.php

@@ -19,7 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus\Validation;
 
-use CloudCreativity\Modules\Bus\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrors;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrorsInterface;
 

src/Bus/Validation/CommandValidatorInterface.php

@@ -19,7 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus\Validation;
 
-use CloudCreativity\Modules\Bus\CommandInterface;
+use CloudCreativity\Modules\Toolkit\Messages\CommandInterface;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrorsInterface;
 
 interface CommandValidatorInterface extends ValidatorInterface

src/Bus/Validation/QueryValidator.php

@@ -19,7 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus\Validation;
 
-use CloudCreativity\Modules\Bus\QueryInterface;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrors;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrorsInterface;
 

src/Bus/Validation/QueryValidatorInterface.php

@@ -19,7 +19,7 @@
 
 namespace CloudCreativity\Modules\Bus\Validation;
 
-use CloudCreativity\Modules\Bus\QueryInterface;
+use CloudCreativity\Modules\Toolkit\Messages\QueryInterface;
 use CloudCreativity\Modules\Toolkit\Result\ListOfErrorsInterface;
 
 interface QueryValidatorInterface extends ValidatorInterface