minor #57697 use more entropy with uniqid() (xabbuh)

fabpot · fabpot · commit c2b0d724ae94 · 2024-07-10T07:43:54.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- use more entropy with uniqid() | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT It looked like using `uniqid()` without opting for more entropy slipped in after #20132 and #20137. Commits ------- 770e7fc use more entropy with uniqid()
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/log_file.phpt
@@ -2,7 +2,7 @@
 Test DeprecationErrorHandler with log file
 --FILE--
 <?php
-$filename = tempnam(sys_get_temp_dir(), 'sf-').uniqid();
+$filename = tempnam(sys_get_temp_dir(), 'sf-').uniqid('', true);
 $k = 'SYMFONY_DEPRECATIONS_HELPER';
 putenv($k.'='.$_SERVER[$k] = $_ENV[$k] = 'logFile='.$filename);
 putenv('ANSICON');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -28,7 +28,7 @@ class AnnotationsCacheWarmerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->cacheDir = sys_get_temp_dir().'/'.uniqid();
+        $this->cacheDir = sys_get_temp_dir().'/'.uniqid('', true);
         $fs = new Filesystem();
         $fs->mkdir($this->cacheDir);
         parent::setUp();
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/ConfigBuilderCacheWarmerTest.php
@@ -36,7 +36,7 @@ class ConfigBuilderCacheWarmerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->varDir = sys_get_temp_dir().'/'.uniqid();
+        $this->varDir = sys_get_temp_dir().'/'.uniqid('', true);
         $fs = new Filesystem();
         $fs->mkdir($this->varDir);
     }
diff --git a/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php b/src/Symfony/Component/Notifier/Bridge/Iqsms/IqsmsTransport.php
@@ -64,7 +64,7 @@ protected function doSend(MessageInterface $message): SentMessage
                         'phone' => $message->getPhone(),
                         'text' => $message->getSubject(),
                         'sender' => $this->from,
-                        'clientId' => uniqid(),
+                        'clientId' => uniqid('', true),
                     ],
                 ],
                 'login' => $this->login,
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.uniqid('CompiledUrlMatcher').'.php';
+        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.uniqid('CompiledUrlMatcher', true).'.php';
     }
 
     protected function tearDown(): void
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryCompilerTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryCompilerTest.php
@@ -29,7 +29,7 @@ final class ClassMetadataFactoryCompilerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory').'.php';
+        $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory', true).'.php';
     }
 
     protected function tearDown(): void

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class AnnotationsCacheWarmerTest extends TestCase`
`28`	`28`
`29`	`29`	`protected function setUp(): void`
`30`	`30`	`{`
`31`		`- $this->cacheDir = sys_get_temp_dir().'/'.uniqid();`
	`31`	`+ $this->cacheDir = sys_get_temp_dir().'/'.uniqid('', true);`
`32`	`32`	`$fs = new Filesystem();`
`33`	`33`	`$fs->mkdir($this->cacheDir);`
`34`	`34`	`parent::setUp();`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ConfigBuilderCacheWarmerTest extends TestCase`
`36`	`36`
`37`	`37`	`protected function setUp(): void`
`38`	`38`	`{`
`39`		`- $this->varDir = sys_get_temp_dir().'/'.uniqid();`
	`39`	`+ $this->varDir = sys_get_temp_dir().'/'.uniqid('', true);`
`40`	`40`	`$fs = new Filesystem();`
`41`	`41`	`$fs->mkdir($this->varDir);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUp(): void`
`33`	`33`	`{`
`34`	`34`	`parent::setUp();`
`35`	`35`
`36`		`- $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.uniqid('CompiledUrlMatcher').'.php';`
	`36`	`+ $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_matcher.'.uniqid('CompiledUrlMatcher', true).'.php';`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`protected function tearDown(): void`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ final class ClassMetadataFactoryCompilerTest extends TestCase`
`29`	`29`
`30`	`30`	`protected function setUp(): void`
`31`	`31`	`{`
`32`		`- $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory').'.php';`
	`32`	`+ $this->dumpPath = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'php_serializer_metadata.'.uniqid('CompiledClassMetadataFactory', true).'.php';`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`protected function tearDown(): void`