jclaveau / php-logical-filter

src/Rule/Trait_RuleWithField.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * @return string $field
      */
-    public final function setField( $field )
+    public final function setField($field)
     {
         if (!is_scalar($field)) {
             throw new \InvalidArgumentEXception(
@@ -49,16 +49,16 @@ 
     public final function renameField($renamings)
     {
         if (is_callable($renamings)) {
-            $this->setField( call_user_func($renamings, $this->field) );
+            $this->setField(call_user_func($renamings, $this->field));
         }
         elseif (is_array($renamings)) {
             if (isset($renamings[$this->field]))
-                $this->setField( $renamings[$this->field] );
+                $this->setField($renamings[$this->field]);
         }
         else {
             throw new \InvalidArgumentException(
                 "\$renamings MUST be a callable or an associative array "
-                ."instead of: " . var_export($renamings, true)
+                ."instead of: ".var_export($renamings, true)
             );
         }
 

Braces +5 added lines, -6 removed lines

@@ -50,12 +50,11 @@
     {
         if (is_callable($renamings)) {
             $this->setField( call_user_func($renamings, $this->field) );
-        }
-        elseif (is_array($renamings)) {
-            if (isset($renamings[$this->field]))
-                $this->setField( $renamings[$this->field] );
-        }
-        else {
+        } elseif (is_array($renamings)) {
+            if (isset($renamings[$this->field])) {
+                            $this->setField( $renamings[$this->field] );
+            }
+        } else {
             throw new \InvalidArgumentException(
                 "\$renamings MUST be a callable or an associative array "
                 ."instead of: " . var_export($renamings, true)

src/Rule/AbstractAtomicRule.php

Spacing +4 added lines, -4 removed lines

@@ -21,14 +21,14 @@ 
      *
      * @return array
      */
-    public function toArray(array $options=[])
+    public function toArray(array $options = [])
     {
         $default_options = [
             'show_instance' => false,
         ];
         foreach ($default_options as $default_option => &$default_value) {
-            if (!isset($options[ $default_option ]))
-                $options[ $default_option ] = $default_value;
+            if (!isset($options[$default_option]))
+                $options[$default_option] = $default_value;
         }
 
 
@@ -51,7 +51,7 @@ 
 
     /**
      */
-    public function toString(array $options=[])
+    public function toString(array $options = [])
     {
         if (!empty($this->cache['string']))
             return $this->cache['string'];

Braces +21 added lines, -16 removed lines

@@ -27,13 +27,15 @@ 
             'show_instance' => false,
         ];
         foreach ($default_options as $default_option => &$default_value) {
-            if (!isset($options[ $default_option ]))
-                $options[ $default_option ] = $default_value;
+            if (!isset($options[ $default_option ])) {
+                            $options[ $default_option ] = $default_value;
+            }
         }
 
 
-        if (!$options['show_instance'] && !empty($this->cache['array']))
-            return $this->cache['array'];
+        if (!$options['show_instance'] && !empty($this->cache['array'])) {
+                    return $this->cache['array'];
+        }
 
         $class = get_class($this);
 
@@ -43,18 +45,20 @@ 
             $this->getValues(),
         ];
 
-        if (!$options['show_instance'])
-            return $this->cache['array'] = $array;
-        else
-            return $array;
+        if (!$options['show_instance']) {
+                    return $this->cache['array'] = $array;
+        } else {
+                    return $array;
+        }
     }
 
     /**
      */
     public function toString(array $options=[])
     {
-        if (!empty($this->cache['string']))
-            return $this->cache['string'];
+        if (!empty($this->cache['string'])) {
+                    return $this->cache['string'];
+        }
 
         $class = get_class($this);
         $operator = $class::operator;
@@ -63,12 +67,13 @@ 
 
         $field = $this->getField();
 
-        if ($field instanceof FilteredValue || $field instanceof FilteredKey)
-            $field = "$field";
-        elseif ($field instanceof \Closure)
-            throw new \Exception("Closures dump not implemented");
-        else
-            $field = "'$field'";
+        if ($field instanceof FilteredValue || $field instanceof FilteredKey) {
+                    $field = "$field";
+        } elseif ($field instanceof \Closure) {
+                    throw new \Exception("Closures dump not implemented");
+        } else {
+                    $field = "'$field'";
+        }
 
         return $this->cache['string'] = "[$field, '$operator', $stringified_value]";
     }