bug #20132 Use "more entropy" option for uniqid() (javiereguiluz)

fabpot · fabpot · commit 3902dc59e1cd · 2016-10-03T08:22:08.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #20132). Discussion ---------- Use "more entropy" option for uniqid() | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - As you can see in [the source code of the PHP uniqid() function](https://github.com/php/php-src/blob/1c295d4a9ac78fcc2f77d6695987598bb7abcb83/ext/standard/uniqid.c#L68) when you don't pass `true` as the second argument, PHP sleeps the application for 1 microsecond (`usleep(1)`) Symfony uses `true` almost everywhere, but there are still some places (mostly in bundles) where this is not the case. Commits ------- 4403e28 Use "more entropy" option for uniqid()
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -86,7 +86,7 @@ public function getProxyCandidates()
         $definitions = array(
             array(new Definition(__CLASS__), true),
             array(new Definition('stdClass'), true),
-            array(new Definition('foo'.uniqid()), false),
+            array(new Definition(uniqid('foo', true)), false),
             array(new Definition(), false),
         );
 
diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php
@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $template .= fread(STDIN, 1024);
             }
 
-            return $this->display($input, $output, array($this->validate($twig, $template, uniqid('sf_'))));
+            return $this->display($input, $output, array($this->validate($twig, $template, uniqid('sf_', true))));
         }
 
         $filesInfo = $this->getFilesInfo($twig, $filenames);

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`109`	`109`	`$template .= fread(STDIN, 1024);`
`110`	`110`	`}`
`111`	`111`
`112`		`- return $this->display($input, $output, array($this->validate($twig, $template, uniqid('sf_'))));`
	`112`	`+ return $this->display($input, $output, array($this->validate($twig, $template, uniqid('sf_', true))));`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$filesInfo = $this->getFilesInfo($twig, $filenames);`