Merge pull request #46 from UseMuffin/on-dirty-with-update-not-dirty

Fix non-dirty, non-empty slug value being incorrectly regenerated on update.

Author: ADmad

src/Model/Behavior/SlugBehavior.php

@@ -225,18 +225,14 @@ public function buildValidator(EventInterface $event, Validator $validator, stri
      */
     public function beforeSave(EventInterface $event, EntityInterface $entity, ArrayObject $options)
     {
-        $onUpdate = $this->getConfig('onUpdate');
-        if (!$entity->isNew() && !$onUpdate) {
+        $isNew = $entity->isNew();
+        if (!$isNew && !$this->getConfig('onUpdate')) {
             return;
         }
 
         $onDirty = $this->getConfig('onDirty');
         $field = $this->getConfig('field');
-        if (
-            !$onDirty
-            && $entity->isDirty($field)
-            && (!$entity->isNew() || (!empty($entity->{$field})))
-        ) {
+        if ($onDirty && !$entity->isDirty($field) && !$isNew) {
             return;
         }
 

tests/TestCase/Model/Behavior/SlugBehaviorTest.php

@@ -9,7 +9,7 @@
 
 class SlugBehaviorTest extends TestCase
 {
-    public $fixtures = [
+    protected $fixtures = [
         'plugin.Muffin/Slug.Tags',
         'plugin.Muffin/Slug.Articles',
         'plugin.Muffin/Slug.ArticlesTags',
@@ -20,7 +20,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->Tags = TableRegistry::get('Muffin/Slug.Tags', ['table' => 'slug_tags']);
+        $this->Tags = $this->getTableLocator()->get('Muffin/Slug.Tags', ['table' => 'slug_tags']);
         $this->Tags->setDisplayField('name');
         $this->Tags->addBehavior('Muffin/Slug.Slug');
 
@@ -30,7 +30,8 @@ public function setUp(): void
     public function tearDown(): void
     {
         parent::tearDown();
-        TableRegistry::clear();
+
+        $this->getTableLocator()->clear();
         unset($this->Behavior, $this->Tags);
     }
 
@@ -99,7 +100,7 @@ public function testBeforeSaveOnUpdate()
         $expected = 'baz';
         $this->assertEquals($expected, $result);
 
-        $tag->unsetProperty('name');
+        unset($tag['name']);
         $tag->namespace = 'foobar';
         $result = $this->Tags->save($tag)->slug;
         $this->assertEquals($expected, $result);
@@ -147,6 +148,32 @@ public function testBeforeSaveDirtyField()
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * Test with onUpdate = true, onDirty = true and slug field is not dirty and
+     * but unrelated field is dirty.
+     *
+     * @return void
+     */
+    public function testBeforeSaveOnUpdateTrueAndOnDirtyTrue()
+    {
+        $this->Tags->behaviors()->Slug->setConfig([
+            'onUpdate' => true,
+            'onDirty' => true,
+        ]);
+
+        $data = ['name' => 'foo', 'slug' => 'bar', 'counter' => 1];
+        $tag = $this->Tags->newEntity($data);
+
+        $tag = $this->Tags->save($tag);
+        $this->assertEquals('bar', $tag->slug);
+        $this->assertSame(1, $tag->counter);
+
+        $tag->counter = 2;
+        $tag = $this->Tags->save($tag);
+        $this->assertEquals('bar', $tag->slug);
+        $this->assertSame(2, $tag->counter);
+    }
+
     /**
      * Make sure no slug is generated when `displayField` is empty.
      */