chore: Add PR's requested changes

Author: matiasperrone-exo

app/Repositories/DoctrineUserTrustedDeviceRepository.php

@@ -24,22 +24,14 @@ protected function getBaseEntity()
         return UserTrustedDevice::class;
     }
 
-    private function buildActiveExpiryExpr(): \Doctrine\Common\Collections\Expr\CompositeExpression
-    {
-        $now = new \DateTime('now', new \DateTimeZone('UTC'));
-        return Criteria::expr()->orX(
-            Criteria::expr()->gt('expires_at', $now),
-            Criteria::expr()->isNull('expires_at')
-        );
-    }
-
     public function getActiveByUserAndIdentifier(User $user, string $deviceIdentifier): ?UserTrustedDevice
     {
+        $now = new \DateTime('now', new \DateTimeZone('UTC'));
         $criteria = Criteria::create()
             ->where(Criteria::expr()->eq('user', $user))
             ->andWhere(Criteria::expr()->eq('device_identifier', $deviceIdentifier))
             ->andWhere(Criteria::expr()->eq('is_revoked', false))
-            ->andWhere($this->buildActiveExpiryExpr())
+            ->andWhere(Criteria::expr()->gt('expires_at', $now))
             ->setMaxResults(1);
 
         $result = $this->matching($criteria)->first();

app/libs/Auth/Models/TwoFactorAuditLog.php

@@ -88,6 +88,4 @@ public function getMetadata(): ?array { return $this->metadata; }
     public function setMetadata(?array $value): void { $this->metadata = $value; }
 
     public function getCreatedAt(): \DateTime { return $this->created_at; }
-
-    public function __get($name) { return $this->{$name}; }
 }