Used https://github.com/skeeks-semenov/yii2-ya-slug.

skeeks-cms · Nov 8, 2017 · 47b4292 · 47b4292
1 parent 653ab36
commit 47b4292
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,10 @@ CHANGELOG
  * Full transition to the use of the component hiqdev/composer-config-plugin
  * Loss of compatibility with older components
 
-4.0.3.2.pre
+4.0.4
 ---------------
+ * Used https://github.com/skeeks-semenov/yii2-ya-slug.
+ * Removed slug behavior https://github.com/skeeks-semenov/yii2-slug-behavior.
  * The ability to filter content properties by type
 
 4.0.3.1

diff --git a/composer.json b/composer.json
@@ -50,6 +50,7 @@
         "paulzi/yii2-adjacency-list": "^2.0",
         "paulzi/yii2-materialized-path": "^2.0",
         "skeeks/yii2-slug-behavior": "^1",
+        "skeeks/yii2-ya-slug": "^1",
         "hiqdev/composer-config-plugin": "^0.2",
         "bower-asset/fancybox": "^3.1",
         "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable"

diff --git a/src/models/CmsContentElement.php b/src/models/CmsContentElement.php
@@ -26,6 +26,7 @@
 use skeeks\cms\relatedProperties\models\RelatedPropertyModel;
 use skeeks\yii2\ajaxfileupload\validators\FileValidator;
 use skeeks\yii2\slug\SlugBehavior;
+use skeeks\yii2\yaslug\YaSlugBehavior;
 use Yii;
 use yii\db\ActiveQuery;
 use yii\helpers\ArrayHelper;
@@ -177,18 +178,12 @@ public function behaviors()
                 'class'                             => HasTrees::className(),
             ],
 
-            SlugBehavior::className() =>
+            YaSlugBehavior::class =>
             [
-                'class'                             => SlugBehavior::class,
+                'class'                             => YaSlugBehavior::class,
                 'attribute'                         => 'name',
                 'slugAttribute'                     => 'code',
                 'maxLength'                         => \Yii::$app->cms->element_max_code_length,
-                'slugifyOptions' => [
-                    'rulesets' => [
-                        skeeks\yii2\slug\SlugRuleProvider::YANDEX,
-                        'default'
-                    ]
-                ]
             ]
         ]);
     }

diff --git a/src/models/Tree.php b/src/models/Tree.php
@@ -28,6 +28,7 @@
 use skeeks\cms\models\behaviors\traits\TreeBehaviorTrait;
 use skeeks\cms\models\behaviors\TreeBehavior;
 use skeeks\yii2\slug\SlugRuleProvider;
+use skeeks\yii2\yaslug\YaSlugHelper;
 use Yii;
 use yii\base\Event;
 use yii\base\Exception;
@@ -658,10 +659,7 @@ protected function _generateCode()
             return $this;
         }
 
-        $slugify = new Slugify(['rulesets' => [
-            SlugRuleProvider::YANDEX, 'default'
-        ]], new SlugRuleProvider());
-        $this->code = $slugify->slugify($this->name);
+        $this->code = YaSlugHelper::slugify($this->name);
 
         if (strlen($this->code) < 2) {
             $this->code = $this->code . "-" . md5(microtime());
@@ -680,7 +678,7 @@ protected function _generateCode()
 
         if (!$this->_isValidCode())
         {
-            $this->code    = $slugify->slugify($this->code . "-" . substr(md5(uniqid() . time()), 0, 4));
+            $this->code    = YaSlugHelper::slugify($this->code . "-" . substr(md5(uniqid() . time()), 0, 4));
 
             if (!$this->_isValidCode())
             {