Merge branch 'main' into audit-record-type-naming-consistency

Author: Seldaek

composer.lock

@@ -40,7 +40,7 @@ private function __construct(
         #[ORM\Column(type: Types::JSON)]
         public readonly array $attributes,
         #[ORM\Column(nullable: true)]
-        public readonly ?int $userId = null,
+        public readonly ?int $actorId = null,
         #[ORM\Column(nullable: true)]
         public readonly ?string $vendor = null,
         #[ORM\Column(nullable: true)]
@@ -50,26 +50,26 @@ private function __construct(
         $this->datetime = new \DateTimeImmutable();
     }
 
-    public static function packageCreated(Package $package, ?User $user): self
+    public static function packageCreated(Package $package, ?User $actor): self
     {
-        return new self(AuditRecordType::PackageCreated, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($user)], $user?->getId(), $package->getVendor(), $package->getId());
+        return new self(AuditRecordType::PackageCreated, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($actor)], $actor?->getId(), $package->getVendor(), $package->getId());
     }
 
-    public static function packageDeleted(Package $package, ?User $user): self
+    public static function packageDeleted(Package $package, ?User $actor): self
     {
-        return new self(AuditRecordType::PackageDeleted, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($user, 'automation')], $user?->getId(), $package->getVendor(), $package->getId());
+        return new self(AuditRecordType::PackageDeleted, ['name' => $package->getName(), 'repository' => $package->getRepository(), 'actor' => self::getUserData($actor, 'automation')], $actor?->getId(), $package->getVendor(), $package->getId());
     }
 
-    public static function canonicalUrlChange(Package $package, ?User $user, string $oldRepository): self
+    public static function canonicalUrlChange(Package $package, ?User $actor, string $oldRepository): self
     {
-        return new self(AuditRecordType::CanonicalUrlChanged, ['name' => $package->getName(), 'repository_from' => $oldRepository, 'repository_to' => $package->getRepository(), 'actor' => self::getUserData($user)], $user?->getId(), $package->getVendor(), $package->getId());
+        return new self(AuditRecordType::CanonicalUrlChanged, ['name' => $package->getName(), 'repository_from' => $oldRepository, 'repository_to' => $package->getRepository(), 'actor' => self::getUserData($actor)], $actor?->getId(), $package->getVendor(), $package->getId());
     }
 
-    public static function versionDeleted(Version $version, ?User $user): self
+    public static function versionDeleted(Version $version, ?User $actor): self
     {
         $package = $version->getPackage();
 
-        return new self(AuditRecordType::VersionDeleted, ['name' => $package->getName(), 'version' => $version->getVersion(), 'actor' => self::getUserData($user, 'automation')], $user?->getId(), $package->getVendor(), $package->getId());
+        return new self(AuditRecordType::VersionDeleted, ['name' => $package->getName(), 'version' => $version->getVersion(), 'actor' => self::getUserData($actor, 'automation')], $actor?->getId(), $package->getVendor(), $package->getId());
     }
 
     public static function versionReferenceChange(Version $version, ?string $oldSourceReference, ?string $oldDistReference): self

src/Entity/AuditRecord.php

@@ -55,7 +55,7 @@ public function insert(AuditRecord $record): void
             'datetime' => $record->datetime,
             'type' => $record->type->value,
             'attributes' => $record->attributes,
-            'userId' => $record->userId,
+            'actorId' => $record->actorId,
             'vendor' => $record->vendor,
             'packageId' => $record->packageId,
         ], [