symfony
diff --git a/‎src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
+22-7Lines changed: 22 additions & 7 deletions b/‎src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Command/GenerateUuidCommand.php
+22-7Lines changed: 22 additions & 7 deletions
diff --git a/‎src/Symfony/Component/Uid/Tests/Command/GenerateUlidCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/Command/GenerateUlidCommandTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Uid/Tests/Command/GenerateUlidCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/Command/GenerateUlidCommandTest.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Uid/Tests/Command/GenerateUuidCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/Command/GenerateUuidCommandTest.php
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/Uid/Tests/Command/GenerateUuidCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Uid/Tests/Command/GenerateUuidCommandTest.php
+9Lines changed: 9 additions & 0 deletions
@@ -44,7 +44,7 @@ protected function configure(): void
                 new InputOption('time-based', null, InputOption::VALUE_REQUIRED, 'The timestamp, to generate a time-based UUID: a parsable date/time string'),
                 new InputOption('node', null, InputOption::VALUE_REQUIRED, 'The UUID whose node part should be used as the node of the generated UUID'),
                 new InputOption('name-based', null, InputOption::VALUE_REQUIRED, 'The name, to generate a name-based UUID'),
-                new InputOption('namespace', null, InputOption::VALUE_REQUIRED, 'The UUID to use at the namespace for named-based UUIDs'),
+                new InputOption('namespace', null, InputOption::VALUE_REQUIRED, 'The UUID to use at the namespace for named-based UUIDs. Predefined namespaces keywords "dns", "url", "oid" and "x500" are accepted'),
                 new InputOption('random-based', null, InputOption::VALUE_NONE, 'To generate a random-based UUID'),
                 new InputOption('count', 'c', InputOption::VALUE_REQUIRED, 'The number of UUID to generate', 1),
                 new InputOption('format', 'f', InputOption::VALUE_REQUIRED, 'The UUID output format: rfc4122, base58 or base32', 'rfc4122'),
@@ -145,12 +145,27 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             case null !== $name:
                 if ($namespace) {
-                    try {
-                        $namespace = Uuid::fromString($namespace);
-                    } catch (\InvalidArgumentException $e) {
-                        $io->error(sprintf('Invalid namespace "%s": %s', $namespace, $e->getMessage()));
-
-                        return 1;
+                    switch ($namespace) {
+                        case 'dns':
+                            $namespace = Uuid::NAMESPACE_DNS;
+                            break;
+                        case 'url':
+                            $namespace = Uuid::NAMESPACE_URL;
+                            break;
+                        case 'oid':
+                            $namespace = Uuid::NAMESPACE_OID;
+                            break;
+                        case 'x500':
+                            $namespace = Uuid::NAMESPACE_X500;
+                            break;
+                        default:
+                            try {
+                                $namespace = Uuid::fromString($namespace);
+                            } catch (\InvalidArgumentException $e) {
+                                $io->error(sprintf('Invalid namespace "%s": %s', $namespace, $e->getMessage()));
+
+                                return 1;
+                            }
                     }
                 }
 
 
@@ -90,7 +90,7 @@ public function testFormat()
         Ulid::fromRfc4122(trim($commandTester->getDisplay()));
     }
 
-    public function testTimestampIncrementWhenGeneratingSeveralUlids()
+    public function testUlidsAreDifferentWhenGeneratingSeveralNow()
     {
         $commandTester = new CommandTester(new GenerateUlidCommand());
 
 
@@ -220,4 +220,13 @@ public function testTimestampIncrementWhenGeneratingSeveralTimeBasedUuids()
 
         $this->assertNotSame($uuids[0], $uuids[1]);
     }
+
+    public function testNamespacePredefinedKeyword()
+    {
+        $commandTester = new CommandTester(new GenerateUuidCommand());
+
+        $this->assertSame(0, $commandTester->execute(['--name-based' => 'https://symfony.com', '--namespace' => 'url']));
+
+        $this->assertSame('9c7d0eda-982d-5708-b4bd-79b3b179725d', (string) Uuid::fromRfc4122(trim($commandTester->getDisplay())));
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function testFormat()`
`90`	`90`	`Ulid::fromRfc4122(trim($commandTester->getDisplay()));`
`91`	`91`	`}`
`92`	`92`
`93`		`- public function testTimestampIncrementWhenGeneratingSeveralUlids()`
	`93`	`+ public function testUlidsAreDifferentWhenGeneratingSeveralNow()`
`94`	`94`	`{`
`95`	`95`	`$commandTester = new CommandTester(new GenerateUlidCommand());`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -220,4 +220,13 @@ public function testTimestampIncrementWhenGeneratingSeveralTimeBasedUuids()`
`220`	`220`
`221`	`221`	`$this->assertNotSame($uuids[0], $uuids[1]);`
`222`	`222`	`}`
	`223`	`+`
	`224`	`+ public function testNamespacePredefinedKeyword()`
	`225`	`+ {`
	`226`	`+ $commandTester = new CommandTester(new GenerateUuidCommand());`
	`227`	`+`
	`228`	`+ $this->assertSame(0, $commandTester->execute(['--name-based' => 'https://symfony.com', '--namespace' => 'url']));`
	`229`	`+`
	`230`	`+ $this->assertSame('9c7d0eda-982d-5708-b4bd-79b3b179725d', (string) Uuid::fromRfc4122(trim($commandTester->getDisplay())));`
	`231`	`+ }`
`223`	`232`	`}`