Merge pull request #538 from patchlevel/move-trace-feature

move trace feature into debug namespace
patchlevel · Mar 13, 2024 · 1e013ed · 1e013ed
2 parents a15c78b + 0cec9f6
commit 1e013ed
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -4,6 +4,9 @@ help:
 vendor: composer.lock
 	composer install
 
+vendor-tools: tools/composer.lock
+	cd tools && composer install
+
 .PHONY: cs-check
 cs-check: vendor                                                                ## run phpcs
 	vendor/bin/phpcs
@@ -49,11 +52,11 @@ infection: vendor
 	vendor/bin/infection
 
 .PHONY: deptrac
-deptrac: tools/vendor                                                           ## run deptrac
+deptrac: vendor-tools                                                           ## run deptrac
 	cd tools && ./vendor/bin/deptrac -c ../deptrac.yaml
 
 .PHONY: deptrac-baseline
-deptrac-baseline: tools/vendor                                                  ## run deptrac and update baseline
+deptrac-baseline: vendor-tools                                                 ## run deptrac and update baseline
 	cd tools && ./vendor/bin/deptrac -c ../deptrac.yaml --formatter=baseline --output=../deptrac-baseline.yaml
 
 .PHONY: static

diff --git a/deptrac-baseline.yaml b/deptrac-baseline.yaml
@@ -6,10 +6,3 @@ deptrac:
       - Patchlevel\EventSourcing\Subscription\RunMode
     Patchlevel\EventSourcing\Attribute\Subscriber:
       - Patchlevel\EventSourcing\Subscription\RunMode
-    Patchlevel\EventSourcing\Repository\MessageDecorator\TraceHeader:
-      - Patchlevel\EventSourcing\Attribute\Header
-    Patchlevel\EventSourcing\Subscription\Subscriber\TraceableSubscriberAccessor:
-      - Patchlevel\EventSourcing\Repository\MessageDecorator\Trace
-      - Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack
-    Patchlevel\EventSourcing\Subscription\Subscriber\TraceableSubscriberAccessorRepository:
-      - Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -21,6 +21,10 @@ deptrac:
       collectors:
         - type: directory
           value: src/Console/.*
+    - name: Debug
+      collectors:
+        - type: directory
+          value: src/Debug/.*
     - name: EventBus
       collectors:
         - type: directory
@@ -100,6 +104,11 @@ deptrac:
       - Serializer
       - Store
       - Subscription
+    Debug:
+      - Attribute
+      - EventBus
+      - Repository
+      - Subscription
     EventBus:
       - Aggregate
       - Attribute

diff --git a/src/Repository/MessageDecorator/Trace.php → src/Debug/Trace/Trace.php b/src/Repository/MessageDecorator/Trace.php → src/Debug/Trace/Trace.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
 /** @experimental */
 final class Trace

diff --git a/...itory/MessageDecorator/TraceDecorator.php → src/Debug/Trace/TraceDecorator.php b/...itory/MessageDecorator/TraceDecorator.php → src/Debug/Trace/TraceDecorator.php
@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
 use Patchlevel\EventSourcing\EventBus\Message;
+use Patchlevel\EventSourcing\Repository\MessageDecorator\MessageDecorator;
 
 use function array_map;
 

diff --git a/...pository/MessageDecorator/TraceHeader.php → src/Debug/Trace/TraceHeader.php b/...pository/MessageDecorator/TraceHeader.php → src/Debug/Trace/TraceHeader.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
 use Patchlevel\EventSourcing\Attribute\Header;
 

diff --git a/...epository/MessageDecorator/TraceStack.php → src/Debug/Trace/TraceStack.php b/...epository/MessageDecorator/TraceStack.php → src/Debug/Trace/TraceStack.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
 use function array_values;
 

diff --git a/...ubscriber/TraceableSubscriberAccessor.php → ...bug/Trace/TraceableSubscriberAccessor.php b/...ubscriber/TraceableSubscriberAccessor.php → ...bug/Trace/TraceableSubscriberAccessor.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Subscription\Subscriber;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
 use Closure;
 use Patchlevel\EventSourcing\EventBus\Message;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\Trace;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack;
 use Patchlevel\EventSourcing\Subscription\RunMode;
+use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessor;
 
 use function array_map;
 

diff --git a/...TraceableSubscriberAccessorRepository.php → ...TraceableSubscriberAccessorRepository.php b/...TraceableSubscriberAccessorRepository.php → ...TraceableSubscriberAccessorRepository.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Subscription\Subscriber;
+namespace Patchlevel\EventSourcing\Debug\Trace;
 
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack;
+use Patchlevel\EventSourcing\Subscription\Subscriber\SubscriberAccessorRepository;
 
 use function array_values;
 

diff --git a/tests/Integration/Subscription/SubscriptionTest.php b/tests/Integration/Subscription/SubscriptionTest.php
@@ -7,14 +7,15 @@
 use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Patchlevel\EventSourcing\Clock\FrozenClock;
+use Patchlevel\EventSourcing\Debug\Trace\TraceableSubscriberAccessorRepository;
+use Patchlevel\EventSourcing\Debug\Trace\TraceDecorator;
+use Patchlevel\EventSourcing\Debug\Trace\TraceHeader;
+use Patchlevel\EventSourcing\Debug\Trace\TraceStack;
 use Patchlevel\EventSourcing\EventBus\DefaultEventBus;
 use Patchlevel\EventSourcing\EventBus\Message;
 use Patchlevel\EventSourcing\EventBus\Serializer\DefaultHeadersSerializer;
 use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
 use Patchlevel\EventSourcing\Repository\DefaultRepositoryManager;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceDecorator;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceHeader;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack;
 use Patchlevel\EventSourcing\Schema\ChainDoctrineSchemaConfigurator;
 use Patchlevel\EventSourcing\Schema\DoctrineSchemaDirector;
 use Patchlevel\EventSourcing\Serializer\DefaultEventSerializer;
@@ -26,7 +27,6 @@
 use Patchlevel\EventSourcing\Subscription\Status;
 use Patchlevel\EventSourcing\Subscription\Store\DoctrineSubscriptionStore;
 use Patchlevel\EventSourcing\Subscription\Subscriber\MetadataSubscriberAccessorRepository;
-use Patchlevel\EventSourcing\Subscription\Subscriber\TraceableSubscriberAccessorRepository;
 use Patchlevel\EventSourcing\Subscription\Subscription;
 use Patchlevel\EventSourcing\Tests\DbalManager;
 use Patchlevel\EventSourcing\Tests\Integration\Subscription\Aggregate\Profile;

diff --git a/...y/MessageDecorator/TraceDecoratorTest.php → ...s/Unit/Debug/Trace/TraceDecoratorTest.php b/...y/MessageDecorator/TraceDecoratorTest.php → ...s/Unit/Debug/Trace/TraceDecoratorTest.php
@@ -2,19 +2,19 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Tests\Unit\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Tests\Unit\Debug\Trace;
 
+use Patchlevel\EventSourcing\Debug\Trace\Trace;
+use Patchlevel\EventSourcing\Debug\Trace\TraceDecorator;
+use Patchlevel\EventSourcing\Debug\Trace\TraceHeader;
+use Patchlevel\EventSourcing\Debug\Trace\TraceStack;
 use Patchlevel\EventSourcing\EventBus\HeaderNotFound;
 use Patchlevel\EventSourcing\EventBus\Message;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\Trace;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceDecorator;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceHeader;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use stdClass;
 
-/** @covers \Patchlevel\EventSourcing\Repository\MessageDecorator\TraceDecorator */
+/** @covers \Patchlevel\EventSourcing\Debug\Trace\TraceDecorator */
 final class TraceDecoratorTest extends TestCase
 {
     use ProphecyTrait;

diff --git a/...itory/MessageDecorator/TraceStackTest.php → tests/Unit/Debug/Trace/TraceStackTest.php b/...itory/MessageDecorator/TraceStackTest.php → tests/Unit/Debug/Trace/TraceStackTest.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Patchlevel\EventSourcing\Tests\Unit\Repository\MessageDecorator;
+namespace Patchlevel\EventSourcing\Tests\Unit\Debug\Trace;
 
-use Patchlevel\EventSourcing\Repository\MessageDecorator\Trace;
-use Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack;
+use Patchlevel\EventSourcing\Debug\Trace\Trace;
+use Patchlevel\EventSourcing\Debug\Trace\TraceStack;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 
-/** @covers \Patchlevel\EventSourcing\Repository\MessageDecorator\TraceStack */
+/** @covers \Patchlevel\EventSourcing\Debug\Trace\TraceStack */
 final class TraceStackTest extends TestCase
 {
     use ProphecyTrait;