Improve code readability.

UseMuffin · Aug 1, 2017 · 436c7ad · 436c7ad
1 parent e4cbd96
commit 436c7ad
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/src/Model/Behavior/SlugBehavior.php b/src/Model/Behavior/SlugBehavior.php
@@ -193,30 +193,31 @@ public function buildValidator(Event $event, Validator $validator, $name)
      */
     public function beforeSave(Event $event, Entity $entity, ArrayObject $options)
     {
-        $config = $this->_config;
-
-        if (!$entity->isNew() && !$config['onUpdate']) {
+        $onUpdate = $this->config('onUpdate');
+        if (!$entity->isNew() && !$onUpdate) {
             return;
         }
 
-        if (!$config['onDirty']
-            && $entity->dirty($config['field'])
-            && (!$entity->isNew() || (!empty($entity->{$config['field']})))
+        $onDirty = $this->config('onDirty');
+        $field = $this->config('field');
+        if (!$onDirty
+            && $entity->dirty($field)
+            && (!$entity->isNew() || (!empty($entity->{$field})))
         ) {
             return;
         }
 
-        if ($entity->dirty($config['field']) && !empty($entity->{$config['field']})) {
-            $slug = $this->slug($entity, $entity->{$config['field']}, $config['separator']);
-            $entity->set($config['field'], $slug);
+        $separator = $this->config('separator');
+        if ($entity->dirty($field) && !empty($entity->{$field})) {
+            $slug = $this->slug($entity, $entity->{$field}, $separator);
+            $entity->set($field, $slug);
 
             return;
         }
 
-        $fields = (array)$config['displayField'];
         $parts = [];
-        foreach ($fields as $field) {
-            $value = Hash::get($entity, $field);
+        foreach ((array)$this->config('displayField') as $displayField) {
+            $value = Hash::get($entity, $displayField);
 
             if ($value === null && !$entity->isNew()) {
                 return;
@@ -231,8 +232,8 @@ public function beforeSave(Event $event, Entity $entity, ArrayObject $options)
             return;
         }
 
-        $slug = $this->slug($entity, implode($config['separator'], $parts), $config['separator']);
-        $entity->set($config['field'], $slug);
+        $slug = $this->slug($entity, implode($separator, $parts), $separator);
+        $entity->set($field, $slug);
     }
 
     /**
@@ -284,7 +285,8 @@ public function slug($entity, $string = null, $separator = null)
 
         $slug = $this->_slug($string, $separator);
 
-        if (isset($entity) && $unique = $this->config('unique')) {
+        $unique = $this->config('unique');
+        if (isset($entity) && $unique) {
             $slug = $unique($entity, $slug, $separator);
         }