Fix slug generation if the getRegenerateSlugOnUpdate method retu… (#472)

Fix slug generation if the getRegenerateSlugOnUpdate method return false

ecs.yaml

@@ -31,6 +31,9 @@ parameters:
             # & bug
             - "*Repository.php"
 
+        SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff:
+            - "tests/Fixtures/Entity/SluggableWithoutRegenerateEntity.php"
+
 services:
     Symplify\CodingStandard\Sniffs\CleanCode\CognitiveComplexitySniff:
         max_cognitive_complexity: 8

src/Model/Sluggable/SluggableMethodsTrait.php

@@ -29,7 +29,7 @@ public function getSlug(): string
      */
     public function generateSlug(): void
     {
-        if (! $this->getRegenerateSlugOnUpdate()) {
+        if ($this->slug !== null && $this->getRegenerateSlugOnUpdate() === false) {
             return;
         }
 

tests/Fixtures/Entity/SluggableWithoutRegenerateEntity.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Knp\DoctrineBehaviors\Tests\Fixtures\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Knp\DoctrineBehaviors\Contract\Entity\SluggableInterface;
+use Knp\DoctrineBehaviors\Model\Sluggable\SluggableTrait;
+
+/**
+ * @ORM\Entity
+ */
+class SluggableWithoutRegenerateEntity implements SluggableInterface
+{
+    use SluggableTrait;
+
+    /**
+     * @ORM\Column(type="string")
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     * @var int
+     */
+    private $id;
+
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getSluggableFields(): array
+    {
+        return ['name'];
+    }
+
+    private function getRegenerateSlugOnUpdate(): bool
+    {
+        return false;
+    }
+}

tests/ORM/SluggableWithoutRegenerateTest.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Knp\DoctrineBehaviors\Tests\ORM;
+
+use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\ORM\EntityRepository;
+use Knp\DoctrineBehaviors\Tests\AbstractBehaviorTestCase;
+use Knp\DoctrineBehaviors\Tests\Fixtures\Entity\SluggableEntity;
+use Knp\DoctrineBehaviors\Tests\Fixtures\Entity\SluggableWithoutRegenerateEntity;
+
+final class SluggableWithoutRegenerateTest extends AbstractBehaviorTestCase
+{
+    /**
+     * @var ObjectRepository|EntityRepository
+     */
+    private $sluggableWithoutRegenerateRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->sluggableWithoutRegenerateRepository = $this->entityManager->getRepository(
+            SluggableWithoutRegenerateEntity::class
+        );
+    }
+
+    public function testSlugLoading(): void
+    {
+        $entity = new SluggableWithoutRegenerateEntity();
+        $entity->setName('The name');
+
+        $this->entityManager->persist($entity);
+        $this->entityManager->flush();
+
+        $id = $entity->getId();
+        $this->assertNotNull($id);
+
+        $this->entityManager->clear();
+
+        /** @var SluggableEntity $entity */
+        $entity = $this->sluggableWithoutRegenerateRepository->find($id);
+
+        $this->assertNotNull($entity);
+        $this->assertSame('the-name', $entity->getSlug());
+    }
+
+    public function testNotUpdatedSlug(): void
+    {
+        $entity = new SluggableWithoutRegenerateEntity();
+        $entity->setName('The name');
+
+        $this->entityManager->persist($entity);
+        $this->entityManager->flush();
+
+        $this->assertSame('the-name', $entity->getSlug());
+
+        $entity->setName('The name 2');
+
+        $this->entityManager->persist($entity);
+        $this->entityManager->flush();
+
+        $this->assertSame('the-name', $entity->getSlug());
+    }
+}