jclaveau / php-logical-filter

src/Converter/InlineSqlMinimalConverter.php

Spacing +8 added lines, -8 removed lines

@@ -47,12 +47,12 @@ 
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter )
+    public function convert(LogicalFilter $filter)
     {
         $this->output = [];
         parent::convert($filter);
         return [
-            'sql' => ! $this->output
+            'sql' => !$this->output
                    ? '1' // True
                    : '('.implode(') OR (', $this->output).')',
             'parameters' => $this->parameters,
@@ -71,7 +71,7 @@ 
     public function onCloseOr()
     {
         $last_key = $this->getLastOrOperandKey();
-        $this->output[ $last_key ] = implode(' AND ', $this->output[ $last_key ]);
+        $this->output[$last_key] = implode(' AND ', $this->output[$last_key]);
     }
 
     /**
@@ -100,7 +100,7 @@ 
             $value = $rule->getValue();
         }
         elseif ($rule instanceof RegexpRule) {
-            $value = RegexpRule::php2mariadbPCRE( $rule->getPattern() );
+            $value = RegexpRule::php2mariadbPCRE($rule->getPattern());
         }
         else {
             throw new \InvalidArgumentException(
@@ -114,7 +114,7 @@ 
             // TODO disable locale to handle separators
         }
         elseif ($value instanceof \DateTime) {
-            $value = "'" . $value->format('Y-m-d H:i:s') . "'";
+            $value = "'".$value->format('Y-m-d H:i:s')."'";
         }
         elseif (gettype($value) == 'string') {
             $value = $this->addParameter($value);
@@ -124,7 +124,7 @@ 
             foreach ($value as $possibility) {
                 $sql_part[] = $this->addParameter($possibility);
             }
-            $value = '(' . implode(', ', $sql_part) . ')';
+            $value = '('.implode(', ', $sql_part).')';
         }
         elseif ($value === null) {
             $value = "NULL";
@@ -142,7 +142,7 @@ 
         }
         else {
             throw new \InvalidArgumentException(
-                "Unhandled type of value: ".gettype($value). ' | ' .var_export($value, true)
+                "Unhandled type of value: ".gettype($value).' | '.var_export($value, true)
             );
         }
 
@@ -167,7 +167,7 @@ 
     protected function appendToLastOrOperandKey($rule)
     {
         $last_key = $this->getLastOrOperandKey();
-        $this->output[ $last_key ][] = $rule;
+        $this->output[$last_key][] = $rule;
     }
 
     /**/

Braces +21 added lines, -34 removed lines

@@ -31,13 +31,15 @@ 
      */
     public function addParameter($value)
     {
-        if (is_numeric($value))
-            return $value;
+        if (is_numeric($value)) {
+                    return $value;
+        }
 
         $uid = 'param_'.hash('crc32b', serialize($value));
 
-        if (isset($this->parameters[$uid]))
-            return ':'.$uid;
+        if (isset($this->parameters[$uid])) {
+                    return ':'.$uid;
+        }
 
         $this->parameters[$uid] = $value;
 
@@ -82,65 +84,50 @@ 
     {
         if ($rule instanceof EqualRule) {
             $value = $rule->getValue();
-        }
-        elseif ($rule instanceof InRule) {
+        } elseif ($rule instanceof InRule) {
             $value = $rule->getPossibilities();
-        }
-        elseif ($rule instanceof NotInRule) {
+        } elseif ($rule instanceof NotInRule) {
             $operator = 'NOT IN';
             $value = $rule->getPossibilities();
-        }
-        elseif ($rule instanceof AboveRule) {
+        } elseif ($rule instanceof AboveRule) {
             $value = $rule->getMinimum();
-        }
-        elseif ($rule instanceof BelowRule) {
+        } elseif ($rule instanceof BelowRule) {
             $value = $rule->getMaximum();
-        }
-        elseif ($rule instanceof NotEqualRule) {
+        } elseif ($rule instanceof NotEqualRule) {
             $value = $rule->getValue();
-        }
-        elseif ($rule instanceof RegexpRule) {
+        } elseif ($rule instanceof RegexpRule) {
             $value = RegexpRule::php2mariadbPCRE( $rule->getPattern() );
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "Unhandled operator '$operator' during SQL query generation"
             );
         }
 
         if (gettype($value) == 'integer') {
-        }
-        elseif (gettype($value) == 'double') {
+        } elseif (gettype($value) == 'double') {
             // TODO disable locale to handle separators
-        }
-        elseif ($value instanceof \DateTime) {
+        } elseif ($value instanceof \DateTime) {
             $value = "'" . $value->format('Y-m-d H:i:s') . "'";
-        }
-        elseif (gettype($value) == 'string') {
+        } elseif (gettype($value) == 'string') {
             $value = $this->addParameter($value);
-        }
-        elseif (gettype($value) == 'array') {
+        } elseif (gettype($value) == 'array') {
             $sql_part = [];
             foreach ($value as $possibility) {
                 $sql_part[] = $this->addParameter($possibility);
             }
             $value = '(' . implode(', ', $sql_part) . ')';
-        }
-        elseif ($value === null) {
+        } elseif ($value === null) {
             $value = "NULL";
             if ($rule instanceof EqualRule) {
                 $operator = 'IS';
-            }
-            elseif ($rule instanceof NotEqualRule) {
+            } elseif ($rule instanceof NotEqualRule) {
                 $operator = 'IS NOT';
-            }
-            else {
+            } else {
                 throw new \InvalidArgumentException(
                     "NULL is only handled for equality / difference"
                 );
             }
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "Unhandled type of value: ".gettype($value). ' | ' .var_export($value, true)
             );