Merge pull request #487 from hermann8u/fix-slug-uniqueness

Fix slug uniqueness
KnpLabs · Jan 6, 2020 · 2cf2585 · 2cf2585
2 parents a099e2e + bffec25
commit 2cf2585
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Repository/DefaultSluggableRepository.php b/src/Repository/DefaultSluggableRepository.php
@@ -27,11 +27,16 @@ public function isSlugUniqueFor(SluggableInterface $sluggable, string $uniqueSlu
             ->select('e')
             ->from($entityClass, 'e')
             ->select('COUNT(e)')
-            ->andWhere('e.id != :id')
             ->andWhere('e.slug = :slug')
-            ->setParameter('id', $sluggable->getId())
             ->setParameter('slug', $uniqueSlug);
 
+        $id = $sluggable->getId();
+        if ($id !== null) {
+            $queryBuilder
+                ->andWhere('e.id != :id')
+                ->setParameter('id', $id);
+        }
+
         return ! (bool) $queryBuilder->getQuery()
             ->getSingleScalarResult();
     }