Fix slug generation using associated table field.

UseMuffin · Jul 10, 2017 · aaa2054 · aaa2054
1 parent c44c6eb
commit aaa2054
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     },
     "require-dev": {
         "cakephp/cakephp": "^3.2.7",
-        "phpunit/phpunit": "4.1.*",
+        "phpunit/phpunit": "<6.0",
         "cocur/slugify": "^1.2"
     },
     "autoload": {

diff --git a/src/Model/Behavior/SlugBehavior.php b/src/Model/Behavior/SlugBehavior.php
@@ -262,7 +262,7 @@ public function slug($entity, $string = null, $separator = '-')
                 if ($entity->errors($field)) {
                     throw new InvalidArgumentException();
                 }
-                $string[] = $entity->get($field);
+                $string[] = $value = Hash::get($entity, $field);
             }
             $string = implode($separator, $string);
         }

diff --git a/tests/TestCase/Model/Behavior/SlugBehaviorTest.php b/tests/TestCase/Model/Behavior/SlugBehaviorTest.php
@@ -157,6 +157,23 @@ public function testSlug()
         $this->assertEquals($expected, $result);
     }
 
+    public function testSlugWithAssociatedTableField()
+    {
+        $Articles = TableRegistry::get('Muffin/Slug.Articles', ['table' => 'slug_articles']);
+        $Authors = TableRegistry::get('Muffin/Slug.Authors', ['table' => 'slug_authors']);
+
+        $Articles->belongsTo('Authors', ['className' => 'Muffin/Slug.Authors']);
+        $Articles->addBehavior('Muffin/Slug.Slug', ['displayField' => ['author.name', 'title']]);
+
+        $data = ['title' => 'foo', 'sub_title' => 'unused'];
+        $article = $Articles->newEntity($data);
+        $article->author = $Authors->get(1);
+
+        $result = $Articles->slug($article);
+        $expected = 'admad-foo';
+        $this->assertEquals($expected, $result);
+    }
+
     public function testBeforeSaveMultiField()
     {
         $Articles = TableRegistry::get('Muffin/Slug.Articles', ['table' => 'slug_articles']);