WIP - add Symfony Uid Support

composer.json

@@ -16,7 +16,8 @@
         "symfony/framework-bundle": "^4.4 | ^5.0 | ^6.0",
         "symfony/phpunit-bridge": "^5.0 | ^6.0",
         "vimeo/psalm": "^4.3",
-        "doctrine/doctrine-bundle": "^2.0.3"
+        "doctrine/doctrine-bundle": "^2.0.3",
+        "symfony/uid": "^v5.1 | ^6.0"
     },
     "conflict": {
         "doctrine/orm": "<2.7",

src/Persistence/Repository/ResetPasswordRequestRepositoryTrait.php

@@ -9,6 +9,9 @@
 
 namespace SymfonyCasts\Bundle\ResetPassword\Persistence\Repository;
 
+use Symfony\Component\Uid\AbstractUid;
+use Symfony\Component\Uid\Ulid;
+use Symfony\Component\Uid\Uuid;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
 
 /**
@@ -41,6 +44,8 @@ public function findResetPasswordRequest(string $selector): ?ResetPasswordReques
 
     public function getMostRecentNonExpiredRequestDate(object $user): ?\DateTimeInterface
     {
+        $params = $this->getQueryParams($user);
+
         // Normally there is only 1 max request per use, but written to be flexible
         /** @var ResetPasswordRequestInterface $resetPasswordRequest */
         $resetPasswordRequest = $this->createQueryBuilder('t')
@@ -61,6 +66,8 @@ public function getMostRecentNonExpiredRequestDate(object $user): ?\DateTimeInte
 
     public function removeResetPasswordRequest(ResetPasswordRequestInterface $resetPasswordRequest): void
     {
+        $params = $this->getQueryParams($resetPasswordRequest->getUser());
+
         $this->createQueryBuilder('t')
             ->delete()
             ->where('t.user = :user')
@@ -82,4 +89,24 @@ public function removeExpiredResetPasswordRequests(): int
 
         return $query->execute();
     }
+
+    private function getQueryParams(object $user): array
+    {
+        $paramValue = $user;
+        $paramType = null;
+
+        if (method_exists($paramValue, 'getId') && class_exists(AbstractUid::class)) {
+            if ($paramValue->getId instanceof Uuid) {
+                $paramType = 'uuid';
+                $paramValue = $paramValue->getId();
+            }
+
+            if ($paramValue->getId instanceof Ulid) {
+                $paramType = 'ulid';
+                $paramValue = $paramValue->getId();
+            }
+        }
+
+        return ['value' => $paramValue, 'type' => $paramType];
+    }
 }

tests/Fixtures/Entity/ResetPasswordTestFixtureUuidRequest.php

@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the SymfonyCasts ResetPasswordBundle package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Uid\Uuid;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
+
+/**
+ * @author Jesse Rushlow <[email protected]>
+ * @author Ryan Weaver   <[email protected]>
+ *
+ * @internal
+ * @ORM\Entity(repositoryClass="SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\ResetPasswordTestFixtureRequestUuidRepository")
+ */
+final class ResetPasswordTestFixtureUuidRequest implements ResetPasswordRequestInterface
+{
+    /**
+     * @ORM\Id()
+     * @ORM\Column(type="uuid")
+     */
+    public $id;
+
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    public $selector;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    public $expiresAt;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     */
+    public $requestedAt;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="ResetPasswordTestFixtureUser")
+     */
+    public $user;
+
+    public function __construct()
+    {
+        $this->id = Uuid::v4();
+    }
+
+    public function getRequestedAt(): \DateTimeInterface
+    {
+        return $this->requestedAt;
+    }
+
+    public function isExpired(): bool
+    {
+        return $this->expiresAt->getTimestamp() <= time();
+    }
+
+    public function getExpiresAt(): \DateTimeInterface
+    {
+    }
+
+    public function getHashedToken(): string
+    {
+    }
+
+    public function getUser(): object
+    {
+        return $this->user;
+    }
+}

tests/Fixtures/ResetPasswordTestFixtureRequestUuidRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the SymfonyCasts ResetPasswordBundle package.
+ * Copyright (c) SymfonyCasts <https://symfonycasts.com/>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures;
+
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
+use SymfonyCasts\Bundle\ResetPassword\Persistence\Repository\ResetPasswordRequestRepositoryTrait;
+use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepositoryInterface;
+use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureUuidRequest;
+
+/**
+ * @author Jesse Rushlow <[email protected]>
+ * @author Ryan Weaver   <[email protected]>
+ *
+ * @internal
+ */
+final class ResetPasswordTestFixtureRequestUuidRepository extends ServiceEntityRepository implements ResetPasswordRequestRepositoryInterface
+{
+    use ResetPasswordRequestRepositoryTrait;
+
+    private $manager;
+
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, ResetPasswordTestFixtureUuidRequest::class);
+    }
+
+    public function createResetPasswordRequest(
+        object $user,
+        \DateTimeInterface $expiresAt,
+        string $selector,
+        string $hashedToken
+    ): ResetPasswordRequestInterface {
+    }
+}