Fixed translated slugs not generating if slug contains object of null values

Author: voidgraphics

src/HasSlug.php

@@ -16,74 +16,54 @@ public static function bootHasSlug()
     {
         static::saving(function($model) {
             $attribute = $model->getSlugStorageAttribute();
-            
-            if(!is_null($model->attributes[$attribute])) return;
-            
-            $model->attributes[$attribute] = $model->generateSlug();
+
+            if($model->attributeIsTranslatable($attribute)) {
+                $model->translateSlugs($attribute);
+            } else {
+                if(!is_null($model->attributes[$attribute])) return;
+
+                $model->attributes[$attribute] = str_slug($model->$sluggable);
+            }
         });
     }
 
     /**
-     * Get the attribute name used to generate the slug from
+     * Generate translated slugs. Keeps any existing translated slugs.
      *
-     * @return string
+     * @param string $attribute
      */
-    public function getSluggable()
+    public function translateSlugs($attribute)
     {
-        return $this->sluggable;
-    }
+        $sluggable = $this->getSluggable();
+        $value = json_decode($this->attributes[$attribute], true);
 
-    /**
-     * Get the attribute name used to store the slug into
-     *
-     * @return string
-     */
-    public function getSlugStorageAttribute()
-    {
-        return $this->slugStorageAttribute ?? 'slug';
-    }
+        foreach($this->getTranslatedLocales($this->getSluggable()) as $locale) {
+            if(!isset($value[$locale]) || is_null($value[$locale])) {
+                $value[$locale] = str_slug($this->getTranslation($sluggable, $locale));
+            }
+        }
 
-    /**
-     * Generate the slug.
-     *
-     * @return false|string
-     */
-    protected function generateSlug()
-    {
-        return $this->slugify($this->getSluggable());
+        $this->attributes[$attribute] = json_encode($value);
     }
 
     /**
-     * Handle the slug generation for translatable and
-     * non-translatable attributes.
+     * Get the attribute name used to generate the slug from
      *
-     * @param string $attribute
-     * @return false|string
+     * @return string
      */
-    protected function slugify($attribute)
+    public function getSluggable()
     {
-        if($this->attributeIsTranslatable($attribute)) {
-            return json_encode($this->translatedSlugs($attribute));
-        }
-
-        return str_slug($this->$attribute);
+        return $this->sluggable;
     }
 
     /**
-     * Handle the generation of translated slugs
+     * Get the attribute name used to store the slug into
      *
-     * @param string $attribute
-     * @return array
+     * @return string
      */
-    protected function translatedSlugs($attribute)
+    public function getSlugStorageAttribute()
     {
-        $slugs = [];
-
-        foreach($this->getTranslatedLocales($attribute) as $locale) {
-            $slugs[$locale] = str_slug($this->getTranslation($attribute, $locale));
-        }
-
-        return $slugs;
+        return $this->slugStorageAttribute ?? 'slug';
     }
 
     /**
@@ -135,7 +115,7 @@ public function getSluggedUrlForRoute(Route $route, $locale = null, $fullUrl = t
     }
 
     /**
-     * Get a bound route's parameters with the 
+     * Get a bound route's parameters with the
      * model's slug set to the desired locale.
      *
      * @param Illuminate\Routing\Route $route