Merge branch '9.0' into 10.x

Signed-off-by: Bruno Gaspar <brunofgaspar1@gmail.com>

Author: brunogaspar

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - Updated for Laravel 7.
 
+### v9.0.1 - 2020-03-06
+
+`FIXED`
+
+- Regression on the getter and setter for the custom slug generator.
+
 ### v9.0.0 - 2019-08-30
 
 - BC Break: PHP 7.2 is the minimum required PHP version

src/TaggableInterface.php

@@ -61,18 +61,18 @@ public static function setTagsModel(string $model): void;
     /**
      * Returns the slug generator.
      *
-     * @return string
+     * @return \Closure|string
      */
-    public static function getSlugGenerator(): string;
+    public static function getSlugGenerator();
 
     /**
      * Sets the slug generator.
      *
-     * @param string $name
+     * @param \Closure|string $name
      *
      * @return void
      */
-    public static function setSlugGenerator(string $name): void;
+    public static function setSlugGenerator($name): void;
 
     /**
      * Returns the entity Eloquent tag model object.

src/TaggableTrait.php

@@ -82,15 +82,15 @@ public static function setTagsModel(string $model): void
     /**
      * {@inheritdoc}
      */
-    public static function getSlugGenerator(): string
+    public static function getSlugGenerator()
     {
         return static::$slugGenerator;
     }
 
     /**
      * {@inheritdoc}
      */
-    public static function setSlugGenerator(string $slugGenerator): void
+    public static function setSlugGenerator($slugGenerator): void
     {
         static::$slugGenerator = $slugGenerator;
     }

src/TagsServiceProvider.php

@@ -11,7 +11,7 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Tags
- * @version    10.0.00
+ * @version    10.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
  * @copyright  (c) 2011-2020, Cartalyst LLC

tests/Stubs/Post.php

@@ -11,7 +11,7 @@
  * bundled with this package in the LICENSE file.
  *
  * @package    Tags
- * @version    10.0.00
+ * @version    10.0.0
  * @author     Cartalyst LLC
  * @license    BSD License (3-clause)
  * @copyright  (c) 2011-2020, Cartalyst LLC

tests/TaggableTraitTest.php

@@ -172,12 +172,24 @@ public function it_can_get_and_set_the_tags_model()
     }
 
     /** @test */
-    public function it_can_get_and_set_the_slug_generator()
+    public function it_can_get_and_set_the_slug_generator_as_a_string()
     {
         $post = new Post();
 
         $post->setSlugGenerator('Illuminate\Support\Str::slug');
 
         $this->assertSame('Illuminate\Support\Str::slug', $post->getSlugGenerator());
     }
+
+    /** @test */
+    public function it_can_get_and_set_the_slug_generator_as_a_closure()
+    {
+        $post = new Post();
+
+        $post->setSlugGenerator(function ($value) {
+            return str_replace(' ', '_', strtolower($value));
+        });
+
+        $this->assertIsObject($post->getSlugGenerator());
+    }
 }