[update] introduce Condition::isTraversing

atk4 · Aug 8, 2020 · e9e6dfb · e9e6dfb
1 parent 030b5e0
commit e9e6dfb
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Model/Scope/Condition.php b/src/Model/Scope/Condition.php
@@ -146,7 +146,7 @@ protected function onChangeModel(): void
             // @todo: consider this when condition is part of OR scope
             if ($this->operator === self::OPERATOR_EQUALS && !is_object($this->value) && !is_array($this->value)) {
                 // key containing '/' means chained references and it is handled in toQueryArguments method
-                if (is_string($field = $this->key) && !str_contains($field, '/')) {
+                if (is_string($field = $this->key) && !$this->isTraversing()) {
                     $field = $model->getField($field);
                 }
 
@@ -158,6 +158,11 @@ protected function onChangeModel(): void
         }
     }
 
+    protected function isTraversing()
+    {
+        return is_string($this->key) && str_contains($this->key, '/');
+    }
+
     public function toQueryArguments(): array
     {
         if ($this->isEmpty()) {
@@ -172,7 +177,7 @@ public function toQueryArguments(): array
             if (is_string($field)) {
                 // shorthand for adding conditions on references
                 // use chained reference names separated by "/"
-                if (str_contains($field, '/')) {
+                if ($this->isTraversing()) {
                     $references = explode('/', $field);
                     $field = array_pop($references);
 
@@ -263,7 +268,7 @@ protected function keyToWords(Model $model): string
         $words = [];
 
         if (is_string($field = $this->key)) {
-            if (str_contains($field, '/')) {
+            if ($this->isTraversing()) {
                 $references = explode('/', $field);
 
                 $words[] = $model->getModelCaption();
@@ -332,7 +337,7 @@ protected function valueToWords(Model $model, $value): string
 
         // handling of scope on references
         if (is_string($field = $this->key)) {
-            if (str_contains($field, '/')) {
+            if ($this->isTraversing()) {
                 $references = explode('/', $field);
 
                 $field = array_pop($references);