Merge pull request #50 from UseMuffin/slug-on-update

Fix slug updating.

Author: ADmad

.github/workflows/ci.yml

@@ -4,11 +4,11 @@ on: [push, pull_request]
 
 jobs:
   testsuite:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '8.0', '8.1']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
         include:
@@ -25,9 +25,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -50,26 +48,24 @@ jobs:
         if [[ ${{ matrix.db-type }} == 'mysql' ]]; then export DB_DSN='mysql://root:root@127.0.0.1/cakephp'; fi
         if [[ ${{ matrix.db-type }} == 'pgsql' ]]; then export DB_DSN='postgres://postgres:postgres@127.0.0.1/postgres'; fi
 
-        if [[ ${{ matrix.php-version }} == '7.2' && ${{ matrix.db-type }} == 'sqlite' ]]; then
+        if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'sqlite' ]]; then
           vendor/bin/phpunit --coverage-clover=coverage.xml
         else
           vendor/bin/phpunit
         fi
 
     - name: Code Coverage Report
-      if: matrix.php-version == '7.2' && matrix.db-type == 'sqlite'
+      if: matrix.php-version == '7.4' && matrix.db-type == 'sqlite'
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       run: bash <(curl -s https://codecov.io/bash)
 
   coding-standard:
     name: Coding Standard
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -86,19 +82,17 @@ jobs:
 
   static-analysis:
     name: Static Analysis
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: '8.0'
-        extension-csv: mbstring, intl
-        coverage: none,
+        extensions: mbstring, intl
+        coverage: none
         tools: vimeo/psalm:4.1
 
     - name: Composer Install

composer.json

@@ -47,5 +47,11 @@
         "psr-4": {
             "Muffin\\Slug\\Test\\": "tests"
         }
+    },
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

src/Model/Behavior/SlugBehavior.php

@@ -232,12 +232,24 @@ public function beforeSave(EventInterface $event, EntityInterface $entity, Array
 
         $onDirty = $this->getConfig('onDirty');
         $field = $this->getConfig('field');
-        if ($onDirty && !$entity->isDirty($field) && !$isNew) {
-            return;
+        $slugFieldDirty = $entity->isDirty($field);
+
+        if ($onDirty && !$slugFieldDirty && !$isNew) {
+            $displayFieldDirty = false;
+            foreach ((array)$this->getConfig('displayField') as $df) {
+                if ($entity->isDirty($df)) {
+                    $displayFieldDirty = true;
+                    break;
+                }
+            }
+
+            if (!$displayFieldDirty) {
+                return;
+            }
         }
 
         $separator = $this->getConfig('separator');
-        if ($entity->isDirty($field) && !empty($entity->{$field})) {
+        if ($slugFieldDirty && !empty($entity->{$field})) {
             $slug = $this->slug($entity, $entity->{$field}, $separator);
             $entity->set($field, $slug);
 

tests/TestCase/Model/Behavior/SlugBehaviorTest.php

@@ -172,6 +172,10 @@ public function testBeforeSaveOnUpdateTrueAndOnDirtyTrue()
         $tag = $this->Tags->save($tag);
         $this->assertEquals('bar', $tag->slug);
         $this->assertSame(2, $tag->counter);
+
+        $tag->name = 'changed';
+        $tag = $this->Tags->save($tag);
+        $this->assertEquals('changed', $tag->slug);
     }
 
     /**