Merge branch 'master' of https://git.itguild.info/stasbilay02/MicroFrameWork

kernel/helpers/Slug.php

@@ -2,6 +2,7 @@
 
 namespace kernel\helpers;
 
+use Illuminate\Database\Eloquent\Model;
 use kernel\FormModel;
 use kernel\modules\post\models\Post;
 
@@ -126,7 +127,29 @@ class Slug
         return $options['lowercase'] ? mb_strtolower($str, 'UTF-8') : $str;
     }
 
-    public static function recursiveCreateSlug($model, $slug, $tmpSlug = '', $id = 1): string
+    /**
+     * @param string $title
+     * @param $model
+     * @return string
+     */
+    public static function createSlug(string $title, $model = null): string
+    {
+        $slug = Slug::url_slug($title, ['transliterate' => true, 'lowercase' => true]);
+        if ($model === null) {
+            return $slug;
+        }
+
+        return Slug::recursiveCreateSlug($model, $slug);
+    }
+
+    /**
+     * @param $model
+     * @param string $slug
+     * @param string $tmpSlug
+     * @param int $id
+     * @return string
+     */
+    private static function recursiveCreateSlug($model, string $slug, string $tmpSlug = '', int $id = 1): string
     {
         if ($tmpSlug === '') $tmpSlug = $slug;
         if ($model::where(['slug' => $tmpSlug])->exists()) {

kernel/modules/post/service/PostService.php

@@ -15,7 +15,8 @@ class PostService
         $model->content = $form_model->getItem('content');
         $model->user_id = $form_model->getItem('user_id');
         $model->title = $form_model->getItem('title');
-        $model->slug = Slug::recursiveCreateSlug(Post::class, $this->createSlug($form_model));
+//        $model->slug = Slug::recursiveCreateSlug(Post::class, $this->createSlug($form_model));
+        $model->slug = Slug::createSlug($form_model->getItem('title'), Post::class);
         if ($model->save()){
             return $model;
         }
@@ -23,11 +24,6 @@ class PostService
         return false;
     }
 
-    public function createSlug(FormModel $form_model): string
-    {
-        return Slug::url_slug($form_model->getItem('title'), ['transliterate' => true, 'lowercase' => true]);
-    }
-
     public function update(FormModel $form_model, Post $post): false|Post
     {
         $post->content = $form_model->getItem('content');