[EasyActivity] Do not use ActivityAction as a type (#1532)

eonx-com · Aug 27, 2024 · bd5864d · bd5864d
1 parent f66e390
commit bd5864d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 16 deletions.
diff --git a/packages/EasyActivity/src/Common/Entity/ActivityLogEntry.php b/packages/EasyActivity/src/Common/Entity/ActivityLogEntry.php
@@ -9,7 +9,7 @@
 
 final class ActivityLogEntry
 {
-    private ActivityAction $action;
+    private string $action;
 
     private ?string $actorId = null;
 
@@ -29,7 +29,7 @@ final class ActivityLogEntry
 
     private DateTimeInterface $updatedAt;
 
-    public function getAction(): ActivityAction
+    public function getAction(): string
     {
         return $this->action;
     }
@@ -79,9 +79,9 @@ public function getUpdatedAt(): DateTimeInterface
         return $this->updatedAt;
     }
 
-    public function setAction(ActivityAction $action): self
+    public function setAction(ActivityAction|string $action): self
     {
-        $this->action = $action;
+        $this->action = \is_string($action) ? $action : $action->value;
 
         return $this;
     }

diff --git a/packages/EasyActivity/src/Common/Factory/ActivityLogEntryFactory.php b/packages/EasyActivity/src/Common/Factory/ActivityLogEntryFactory.php
@@ -19,7 +19,7 @@ public function __construct(
     ) {
     }
 
-    public function create(ActivityAction $action, object $object, array $changeSet): ?ActivityLogEntry
+    public function create(ActivityAction|string $action, object $object, array $changeSet): ?ActivityLogEntry
     {
         $subject = $this->subjectResolver->resolve($object);
         if ($subject === null) {

diff --git a/packages/EasyActivity/src/Common/Factory/ActivityLogEntryFactoryInterface.php b/packages/EasyActivity/src/Common/Factory/ActivityLogEntryFactoryInterface.php
@@ -8,5 +8,5 @@
 
 interface ActivityLogEntryFactoryInterface
 {
-    public function create(ActivityAction $action, object $object, array $changeSet): ?ActivityLogEntry;
+    public function create(ActivityAction|string $action, object $object, array $changeSet): ?ActivityLogEntry;
 }
diff --git a/packages/EasyActivity/src/Common/Logger/ActivityLoggerInterface.php b/packages/EasyActivity/src/Common/Logger/ActivityLoggerInterface.php
@@ -7,5 +7,5 @@
 
 interface ActivityLoggerInterface
 {
-    public function addActivityLogEntry(ActivityAction $action, object $object, array $changeSet): void;
+    public function addActivityLogEntry(ActivityAction|string $action, object $object, array $changeSet): void;
 }
diff --git a/packages/EasyActivity/src/Common/Logger/AsyncActivityLogger.php b/packages/EasyActivity/src/Common/Logger/AsyncActivityLogger.php
@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    public function addActivityLogEntry(ActivityAction $action, object $object, array $changeSet): void
+    public function addActivityLogEntry(ActivityAction|string $action, object $object, array $changeSet): void
     {
         $logEntry = $this->activityLogEntryFactory->create($action, $object, $changeSet);
 

diff --git a/packages/EasyActivity/src/Common/Logger/SyncActivityLogger.php b/packages/EasyActivity/src/Common/Logger/SyncActivityLogger.php
@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    public function addActivityLogEntry(ActivityAction $action, object $object, array $changeSet): void
+    public function addActivityLogEntry(ActivityAction|string $action, object $object, array $changeSet): void
     {
         $logEntry = $this->activityLogEntryFactory->create($action, $object, $changeSet);
 

diff --git a/packages/EasyActivity/src/Common/Resolver/ActivitySubjectDataResolverInterface.php b/packages/EasyActivity/src/Common/Resolver/ActivitySubjectDataResolverInterface.php
@@ -10,7 +10,7 @@
 interface ActivitySubjectDataResolverInterface
 {
     public function resolve(
-        ActivityAction $action,
+        ActivityAction|string $action,
         ActivitySubjectInterface $subject,
         array $changeSet,
     ): ?ActivitySubjectData;

diff --git a/packages/EasyActivity/src/Common/Resolver/DefaultActivitySubjectDataResolver.php b/packages/EasyActivity/src/Common/Resolver/DefaultActivitySubjectDataResolver.php
@@ -16,7 +16,7 @@ public function __construct(
     }
 
     public function resolve(
-        ActivityAction $action,
+        ActivityAction|string $action,
         ActivitySubjectInterface $subject,
         array $changeSet,
     ): ?ActivitySubjectData {
@@ -32,7 +32,7 @@ public function resolve(
         return new ActivitySubjectData($serializedData, $serializedOldData);
     }
 
-    private function resolveChangeData(ActivityAction $action, array $changeSet): array
+    private function resolveChangeData(ActivityAction|string $action, array $changeSet): array
     {
         $oldData = [];
         $data = [];

diff --git a/packages/EasyActivity/src/Doctrine/Store/DoctrineDbalStore.php b/packages/EasyActivity/src/Doctrine/Store/DoctrineDbalStore.php
@@ -20,8 +20,7 @@ public function __construct(
     public function store(ActivityLogEntry $logEntry): ActivityLogEntry
     {
         $data = [
-            'action' => $logEntry->getAction()
-                ->value,
+            'action' => $logEntry->getAction(),
             'actor_id' => $logEntry->getActorId(),
             'actor_name' => $logEntry->getActorName(),
             'actor_type' => $logEntry->getActorType(),

diff --git a/...y/tests/Fixture/app/src/ActivitySubjectDataResolver/CustomActivitySubjectDataResolver.php b/...y/tests/Fixture/app/src/ActivitySubjectDataResolver/CustomActivitySubjectDataResolver.php
@@ -11,7 +11,7 @@
 final readonly class CustomActivitySubjectDataResolver implements ActivitySubjectDataResolverInterface
 {
     public function resolve(
-        ActivityAction $action,
+        ActivityAction|string $action,
         ActivitySubjectInterface $subject,
         array $changeSet,
     ): ?ActivitySubjectData {

diff --git a/packages/EasyActivity/tests/Unit/src/Common/Factory/ActivityLogEntryFactoryTest.php b/packages/EasyActivity/tests/Unit/src/Common/Factory/ActivityLogEntryFactoryTest.php
@@ -51,7 +51,7 @@ public function testCreateSucceeds(): void
         );
         self::assertNull($result->getSubjectOldData());
         self::assertSame(DefaultActorResolver::DEFAULT_ACTOR_TYPE, $result->getActorType());
-        self::assertSame(ActivityAction::Create, $result->getAction());
+        self::assertSame(ActivityAction::Create->value, $result->getAction());
         self::assertNull($result->getActorName());
         self::assertSame((string)(new NilUuid()), $result->getSubjectId());
         self::assertSame(Article::class, $result->getSubjectType());