refactor: remove TimestampTokenGenerator & improving UuidTokenGenerator

siganushka · Nov 16, 2024 · 3d439a0 · 3d439a0
1 parent 18e2efc
commit 3d439a0
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 44 deletions.
diff --git a/src/DependencyInjection/SiganushkaRequestTokenExtension.php b/src/DependencyInjection/SiganushkaRequestTokenExtension.php
@@ -6,12 +6,14 @@
 
 use Siganushka\RequestTokenBundle\EventListener\RequestTokenListener;
 use Siganushka\RequestTokenBundle\Generator\RequestTokenGeneratorInterface;
+use Siganushka\RequestTokenBundle\Generator\UuidTokenGenerator;
 use Siganushka\RequestTokenBundle\Monolog\Processor\RequestTokenProcessor;
 use Symfony\Bundle\MonologBundle\MonologBundle;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
+use Symfony\Component\Uid\Uuid;
 
 class SiganushkaRequestTokenExtension extends Extension
 {
@@ -34,6 +36,10 @@ public function load(array $configs, ContainerBuilder $container): void
             $requestTokenProcessorDef->setArgument('$headerName', $config['header_name']);
             $requestTokenProcessorDef->addTag('monolog.processor');
 
+            if (!class_exists(Uuid::class)) {
+                $container->removeDefinition(UuidTokenGenerator::class);
+            }
+
             if (!class_exists(MonologBundle::class)) {
                 $container->removeDefinition(RequestTokenProcessor::class);
             }

diff --git a/src/Generator/TimestampTokenGenerator.php b/src/Generator/TimestampTokenGenerator.php
diff --git a/src/Generator/UniqidTokenGenerator.php b/src/Generator/UniqidTokenGenerator.php
@@ -8,6 +8,6 @@ class UniqidTokenGenerator implements RequestTokenGeneratorInterface
 {
     public function generate(): string
     {
-        return uniqid();
+        return uniqid('', true);
     }
 }
diff --git a/src/Generator/UuidTokenGenerator.php b/src/Generator/UuidTokenGenerator.php
@@ -4,16 +4,22 @@
 
 namespace Siganushka\RequestTokenBundle\Generator;
 
-use Symfony\Component\Uid\Uuid;
+use Symfony\Component\Uid\Factory\NameBasedUuidFactory;
+use Symfony\Component\Uid\Factory\RandomBasedUuidFactory;
+use Symfony\Component\Uid\Factory\TimeBasedUuidFactory;
+use Symfony\Component\Uid\Factory\UuidFactory;
 
 class UuidTokenGenerator implements RequestTokenGeneratorInterface
 {
-    public function generate(): string
+    private UuidFactory|NameBasedUuidFactory|RandomBasedUuidFactory|TimeBasedUuidFactory $factory;
+
+    public function __construct(UuidFactory $factory = null)
     {
-        if (!class_exists(Uuid::class)) {
-            throw new \LogicException(\sprintf('The "%s" class requires the "Uid" component. Try running "composer require symfony/uid".', self::class));
-        }
+        $this->factory = $factory ?? new UuidFactory();
+    }
 
-        return (string) Uuid::v1();
+    public function generate(): string
+    {
+        return (string) $this->factory->create();
     }
 }
diff --git a/tests/DependencyInjection/SiganushkaRequestTokenExtensionTest.php b/tests/DependencyInjection/SiganushkaRequestTokenExtensionTest.php
@@ -8,7 +8,6 @@
 use Siganushka\RequestTokenBundle\DependencyInjection\SiganushkaRequestTokenExtension;
 use Siganushka\RequestTokenBundle\EventListener\RequestTokenListener;
 use Siganushka\RequestTokenBundle\Generator\RequestTokenGeneratorInterface;
-use Siganushka\RequestTokenBundle\Generator\TimestampTokenGenerator;
 use Siganushka\RequestTokenBundle\Generator\UniqidTokenGenerator;
 use Siganushka\RequestTokenBundle\Generator\UuidTokenGenerator;
 use Siganushka\RequestTokenBundle\Monolog\Processor\RequestTokenProcessor;
@@ -23,7 +22,6 @@ public function testLoadDefaultConfig(): void
 
         static::assertFalse($container->hasAlias(RequestTokenGeneratorInterface::class));
         static::assertFalse($container->hasDefinition(RequestTokenListener::class));
-        static::assertFalse($container->hasDefinition(TimestampTokenGenerator::class));
         static::assertFalse($container->hasDefinition(UniqidTokenGenerator::class));
         static::assertFalse($container->hasDefinition(UuidTokenGenerator::class));
         static::assertFalse($container->hasDefinition(RequestTokenProcessor::class));
@@ -41,7 +39,6 @@ public function testLoadCustomConfig(): void
 
         static::assertTrue($container->hasAlias(RequestTokenGeneratorInterface::class));
         static::assertTrue($container->hasDefinition(RequestTokenListener::class));
-        static::assertTrue($container->hasDefinition(TimestampTokenGenerator::class));
         static::assertTrue($container->hasDefinition(UniqidTokenGenerator::class));
         static::assertTrue($container->hasDefinition(UuidTokenGenerator::class));
         static::assertTrue($container->hasDefinition(RequestTokenProcessor::class));

diff --git a/tests/Generator/TimestampTokenGeneratorTest.php b/tests/Generator/TimestampTokenGeneratorTest.php