Revert to trully unique uniqid

sonata-project · Jan 21, 2020 · 8a92d8f · 8a92d8f
1 parent 11fcc70
commit 8a92d8f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 28 deletions.
diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
@@ -1933,7 +1933,7 @@ public function setUniqid($uniqid)
     public function getUniqid()
     {
         if (!$this->uniqid) {
-            $this->uniqid = 's'.substr(md5($this->getBaseCodeRoute()), 0, 10);
+            $this->uniqid = 's'.uniqid();
         }
 
         return $this->uniqid;

diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
@@ -668,33 +668,6 @@ public function testSetUniqid(): void
         $this->assertSame($uniqid, $admin->getUniqid());
     }
 
-    public function testUniqidConsistency(): void
-    {
-        $admin = $this->getMockForAbstractClass(AbstractAdmin::class, [
-            'sonata.abstract.admin',
-            'AbstractBundle\Entity\Foo',
-            'SonataAbstractBundle:FooAdmin',
-        ]);
-        $admin->initialize();
-
-        $uniqid = $admin->getUniqid();
-        $admin->setUniqid(null);
-
-        $this->assertSame($uniqid, $admin->getUniqid());
-
-        $parentAdmin = $this->getMockForAbstractClass(AbstractAdmin::class, [
-            'sonata.abstract.parent.admin',
-            'AbstractBundle\Entity\Bar',
-            'SonataAbstractBundle:BarAdmin',
-        ]);
-        $parentAdmin->initialize();
-
-        $admin->setParent($parentAdmin);
-        $admin->setUniqid(null);
-
-        $this->assertNotSame($uniqid, $admin->getUniqid());
-    }
-
     public function testToString(): void
     {
         $admin = new PostAdmin('sonata.post.admin.post', 'NewsBundle\Entity\Post', 'SonataNewsBundle:PostAdmin');