EZP-30008: More unique uniqid() (#2523)

ezsystems · Jan 18, 2019 · 776db6a · 776db6a
1 parent ad0a470
commit 776db6a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Features/Context/FieldTypeContext.php b/eZ/Bundle/EzPublishCoreBundle/Features/Context/FieldTypeContext.php
@@ -334,7 +334,7 @@ public function getThisContentId()
     private function createContentType()
     {
         $name = $this->fieldConstructionObject['fieldType']->identifier;
-        $name = $name . '#' . uniqid();
+        $name = uniqid($name . '#', true);
         $identifier = strtolower($name);
         $contentTypeCreateStruct = $this->contentTypeService->newContentTypeCreateStruct($identifier);
         $contentTypeCreateStruct->mainLanguageCode = self::DEFAULT_LANGUAGE;

diff --git a/eZ/Bundle/EzPublishCoreBundle/Features/Context/QueryControllerContext.php b/eZ/Bundle/EzPublishCoreBundle/Features/Context/QueryControllerContext.php
@@ -108,7 +108,7 @@ private function createFolder()
             'eng-GB'
         );
 
-        $struct->setField('name', uniqid('Query Controller BDD '));
+        $struct->setField('name', uniqid('Query Controller BDD ', true));
 
         $contentDraft = $contentService->createContent(
             $struct,

diff --git a/eZ/Bundle/EzPublishCoreBundle/Features/Context/UserContext.php b/eZ/Bundle/EzPublishCoreBundle/Features/Context/UserContext.php
@@ -563,7 +563,7 @@ private function findNonExistingUserEmail($username = 'User')
         }
 
         for ($i = 0; $i < 20; ++$i) {
-            $email = 'User#' . uniqid() . '@ez.no';
+            $email = uniqid('User#', true) . '@ez.no';
             if (!$this->checkUserExistenceByEmail($email)) {
                 return $email;
             }
@@ -582,7 +582,7 @@ private function findNonExistingUserEmail($username = 'User')
     private function findNonExistingUserName()
     {
         for ($i = 0; $i < 20; ++$i) {
-            $username = 'User#' . uniqid();
+            $username = uniqid('User#', true);
             if (!$this->checkUserExistenceByUsername($username)) {
                 return $username;
             }

diff --git a/eZ/Bundle/EzPublishRestBundle/Tests/Functional/RootTest.php b/eZ/Bundle/EzPublishRestBundle/Tests/Functional/RootTest.php
@@ -36,7 +36,7 @@ public function testCatchAll($uri)
     {
         self::markTestSkipped('@todo fixme');
         $response = $this->sendHttpRequest(
-            $this->createHttpRequest('GET', '/api/ezp/v2/' . uniqid('rest'), '', 'Stuff+json')
+            $this->createHttpRequest('GET', '/api/ezp/v2/' . uniqid('rest', true), '', 'Stuff+json')
         );
         self::assertHttpResponseCodeEquals($response, 404);
         $responseArray = json_decode($response->getContent(), true);

diff --git a/eZ/Bundle/EzPublishRestBundle/Tests/Functional/TestCase.php b/eZ/Bundle/EzPublishRestBundle/Tests/Functional/TestCase.php
@@ -295,7 +295,8 @@ protected function getContentLocations($contentHref)
     protected function addTestSuffix($string)
     {
         if (!isset(self::$testSuffix)) {
-            self::$testSuffix = uniqid();
+            /** @noinspection NonSecureUniqidUsageInspection */
+            self::$testSuffix = uniqid('', true);
         }
 
         return $string . '_' . self::$testSuffix;

diff --git a/eZ/Publish/API/Repository/Tests/BaseTest.php b/eZ/Publish/API/Repository/Tests/BaseTest.php
@@ -544,7 +544,7 @@ public function createUserWithPolicies($login, array $policiesData)
             $userCreateStruct->setField('last_name', $login);
             $user = $userService->createUser($userCreateStruct, [$userService->loadUserGroup(4)]);
 
-            $role = $this->createRoleWithPolicies(uniqid('role_for_' . $login . '_'), $policiesData);
+            $role = $this->createRoleWithPolicies(uniqid('role_for_' . $login . '_', true), $policiesData);
             $roleService->assignRoleToUser($role, $user);
 
             $repository->commit();

diff --git a/eZ/Publish/API/Repository/Tests/FieldType/KeywordIntegrationTest.php b/eZ/Publish/API/Repository/Tests/FieldType/KeywordIntegrationTest.php
@@ -395,8 +395,8 @@ private function assertContentFieldHasCorrectData($contentId, KeywordValue $valu
     public function testKeywordsAreCaseSensitive()
     {
         $contentType = $this->testCreateContentType();
-        $publishedContent01 = $this->createAndPublishContent('Foo', $contentType, md5(uniqid() . microtime()));
-        $publishedContent02 = $this->createAndPublishContent('foo', $contentType, md5(uniqid() . microtime()));
+        $publishedContent01 = $this->createAndPublishContent('Foo', $contentType, md5(uniqid(__METHOD__, true)));
+        $publishedContent02 = $this->createAndPublishContent('foo', $contentType, md5(uniqid(__METHOD__, true)));
 
         $data = $publishedContent01->getField('data')->value;
         $this->assertCount(1, $data->values);