Cleaned up ValidatesExpressions.php

LaravelFreelancerNL · Sep 21, 2021 · b4f91d5 · b4f91d5
1 parent 64f2733
commit b4f91d5
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 124 deletions.
diff --git a/src/Traits/ValidatesExpressions.php b/src/Traits/ValidatesExpressions.php
@@ -7,36 +7,8 @@
 
 trait ValidatesExpressions
 {
-    /**
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function isBind($value): bool
-    {
-        if (is_string($value)) {
-            return true;
-        }
-        if (is_object($value)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function isCollectionBind($value): bool
-    {
-        if (is_string($value)) {
-            return true;
-        }
-
-        return false;
-    }
+    use ValidatesOperators;
+    use ValidatesReferences;
 
     /**
      * @param mixed $value
@@ -110,33 +82,6 @@ public function isFunction($value): bool
         return $value instanceof FunctionExpression;
     }
 
-    /**
-     * @param mixed $operator
-     * @return bool
-     */
-    public function isLogicalOperator($operator): bool
-    {
-        return isset($this->logicalOperators[strtoupper($operator)]);
-    }
-
-    /**
-     * @param mixed $operator
-     * @return bool
-     */
-    public function isComparisonOperator($operator): bool
-    {
-        return isset($this->comparisonOperators[strtoupper($operator)]);
-    }
-
-    /**
-     * @param mixed $operator
-     * @return bool
-     */
-    public function isArithmeticOperator($operator): bool
-    {
-        return isset($this->arithmeticOperators[$operator]);
-    }
-
     /**
      * @param mixed $value
      * @return bool
@@ -218,73 +163,6 @@ public function isId($value): bool
         return false;
     }
 
-    /**
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function isVariable($value): bool
-    {
-        if (is_string($value) && preg_match('/^\$?[a-zA-Z_][a-zA-Z0-9_]*+$/', $value)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param mixed  $value
-     * @param  array  $registeredVariables
-     * @return bool
-     */
-    public function isRegisteredVariable($value, $registeredVariables = []): bool
-    {
-        return isset($registeredVariables[$value]);
-    }
-
-    /**
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    public function isAttribute($value): bool
-    {
-        $pattern = '/^(@?[\d\w_]+|`@?[\d\w_]+`)(\[\`.+\`\]|\[[\d\w\*]*\])*'
-            . '(\.(\`.+\`|@?[\d\w]*)(\[\`.+\`\]|\[[\d\w\*]*\])*)*$/';
-        if (
-            is_string($value) &&
-            preg_match($pattern, $value)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param mixed $value
-     * @param array $registeredVariables
-     * @return bool
-     */
-    public function isReference($value, $registeredVariables = []): bool
-    {
-        $variables = '';
-        if (!empty($registeredVariables)) {
-            $variables = implode('|', $registeredVariables);
-        }
-
-        if (! is_string($value) || empty($value)) {
-            return false;
-        }
-
-        return (bool) preg_match(
-            '/^('
-                . $variables
-                . '|CURRENT|NEW|OLD)(\[\`.+\`\]|\[[\d\w\*]*\])*(\.(\`.+\`|@?[\d\w]*)(\[\`.+\`\]|\[[\d\w\*]*\])*)*$/',
-            $value
-        );
-    }
-
     /**
      * @param mixed $value
      *

diff --git a/src/Traits/ValidatesOperators.php b/src/Traits/ValidatesOperators.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace LaravelFreelancerNL\FluentAQL\Traits;
+
+trait ValidatesOperators
+{
+    /**
+     * @param mixed $operator
+     * @return bool
+     */
+    public function isLogicalOperator($operator): bool
+    {
+        return isset($this->logicalOperators[strtoupper($operator)]);
+    }
+
+    /**
+     * @param mixed $operator
+     * @return bool
+     */
+    public function isComparisonOperator($operator): bool
+    {
+        return isset($this->comparisonOperators[strtoupper($operator)]);
+    }
+
+    /**
+     * @param mixed $operator
+     * @return bool
+     */
+    public function isArithmeticOperator($operator): bool
+    {
+        return isset($this->arithmeticOperators[$operator]);
+    }
+}
diff --git a/src/Traits/ValidatesReferences.php b/src/Traits/ValidatesReferences.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace LaravelFreelancerNL\FluentAQL\Traits;
+
+trait ValidatesReferences
+{
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public function isBind($value): bool
+    {
+        if (is_string($value)) {
+            return true;
+        }
+        if (is_object($value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public function isCollectionBind($value): bool
+    {
+        if (is_string($value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public function isVariable($value): bool
+    {
+        if (is_string($value) && preg_match('/^\$?[a-zA-Z_][a-zA-Z0-9_]*+$/', $value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed  $value
+     * @param  array  $registeredVariables
+     * @return bool
+     */
+    public function isRegisteredVariable($value, $registeredVariables = []): bool
+    {
+        return isset($registeredVariables[$value]);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return bool
+     */
+    public function isAttribute($value): bool
+    {
+        $pattern = '/^(@?[\d\w_]+|`@?[\d\w_]+`)(\[\`.+\`\]|\[[\d\w\*]*\])*'
+            . '(\.(\`.+\`|@?[\d\w]*)(\[\`.+\`\]|\[[\d\w\*]*\])*)*$/';
+        if (
+            is_string($value) &&
+            preg_match($pattern, $value)
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param mixed $value
+     * @param array $registeredVariables
+     * @return bool
+     */
+    public function isReference($value, $registeredVariables = []): bool
+    {
+        $variables = '';
+        if (!empty($registeredVariables)) {
+            $variables = implode('|', $registeredVariables);
+        }
+
+        if (! is_string($value) || empty($value)) {
+            return false;
+        }
+
+        return (bool) preg_match(
+            '/^('
+            . $variables
+            . '|CURRENT|NEW|OLD)(\[\`.+\`\]|\[[\d\w\*]*\])*(\.(\`.+\`|@?[\d\w]*)(\[\`.+\`\]|\[[\d\w\*]*\])*)*$/',
+            $value
+        );
+    }
+}