Level-2 / Maphper

maphper/lib/ArrayFilter.php

Indentation +40 added lines, -40 removed lines

@@ -3,50 +3,50 @@
 use Maphper\Maphper;
 
 class ArrayFilter {
-    private $array;
+	private $array;
 
-    public function __construct(array $array) {
-        $this->array = $array;
-    }
+	public function __construct(array $array) {
+		$this->array = $array;
+	}
 
-    public function filter($fields) {
-        $filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
-        // Need to reset indexes
-        $filteredArray = array_values($filteredArray);
-        return $filteredArray;
-    }
+	public function filter($fields) {
+		$filteredArray = array_filter($this->array, $this->getSearchFieldFunction($fields, \Maphper\Maphper::FIND_EXACT | \Maphper\Maphper::FIND_AND));
+		// Need to reset indexes
+		$filteredArray = array_values($filteredArray);
+		return $filteredArray;
+	}
 
-    private function getSearchFieldFunction($fields, $mode) {
-        return function ($data) use ($fields, $mode) {
-            foreach ($fields as $key => $val) {
-                $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
+	private function getSearchFieldFunction($fields, $mode) {
+		return function ($data) use ($fields, $mode) {
+			foreach ($fields as $key => $val) {
+				$currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
-            }
-            return !(Maphper::FIND_OR & $mode);
-        };
-    }
+				if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
+				else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+			}
+			return !(Maphper::FIND_OR & $mode);
+		};
+	}
 
-    private function getIfFieldMatches($key, $val, $data, $mode) {
-        if (is_numeric($key) && is_array($val)) {
-            return $this->getSearchFieldFunction($val, $key)($data);
-        }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
-    }
+	private function getIfFieldMatches($key, $val, $data, $mode) {
+		if (is_numeric($key) && is_array($val)) {
+			return $this->getSearchFieldFunction($val, $key)($data);
+		}
+		else if (!isset($data->$key)) return false;
+		else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
+			return in_array($data->$key, $val);
+		else
+			return $this->processFilter($mode, $val, $data->$key);
+	}
 
-    private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
-        return $expected == $actual;
-    }
+	private function processFilter($mode, $expected, $actual) {
+		if (Maphper::FIND_NOT & $mode) return $expected != $actual;
+		else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
+		else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
+		else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
+		else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
+		else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
+		else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+		return $expected == $actual;
+	}
 }

Braces +26 added lines, -14 removed lines

@@ -21,8 +21,11 @@ 
             foreach ($fields as $key => $val) {
                 $currentFieldResult = $this->getIfFieldMatches($key, $val, $data, $mode);
 
-                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) return true;
-                else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) return false;
+                if (Maphper::FIND_OR & $mode && $currentFieldResult === true) {
+                	return true;
+                } else if (!(Maphper::FIND_OR & $mode) && $currentFieldResult === false) {
+                	return false;
+                }
             }
             return !(Maphper::FIND_OR & $mode);
         };
@@ -31,22 +34,31 @@ 
     private function getIfFieldMatches($key, $val, $data, $mode) {
         if (is_numeric($key) && is_array($val)) {
             return $this->getSearchFieldFunction($val, $key)($data);
+        } else if (!isset($data->$key)) {
+        	return false;
+        } else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val)) {
+                    return in_array($data->$key, $val);
+        } else {
+                    return $this->processFilter($mode, $val, $data->$key);
         }
-        else if (!isset($data->$key)) return false;
-        else if (!(Maphper::FIND_BETWEEN & $mode) && !is_numeric($key) && is_array($val))
-            return in_array($data->$key, $val);
-        else
-            return $this->processFilter($mode, $val, $data->$key);
     }
 
     private function processFilter($mode, $expected, $actual) {
-        if (Maphper::FIND_NOT & $mode) return $expected != $actual;
-        else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) return $expected <= $actual;
-        else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) return $expected >= $actual;
-        else if (Maphper::FIND_GREATER & $mode) return $expected < $actual;
-        else if (Maphper::FIND_LESS & $mode) return $expected > $actual;
-        else if (Maphper::FIND_BETWEEN & $mode) return $expected[0] <= $actual && $actual <= $expected[1];
-        else if (Maphper::FIND_NOCASE & $mode) return strtolower($expected) == strtolower($actual);
+        if (Maphper::FIND_NOT & $mode) {
+        	return $expected != $actual;
+        } else if (Maphper::FIND_GREATER & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected <= $actual;
+        } else if (Maphper::FIND_LESS & $mode && Maphper::FIND_EXACT & $mode) {
+        	return $expected >= $actual;
+        } else if (Maphper::FIND_GREATER & $mode) {
+        	return $expected < $actual;
+        } else if (Maphper::FIND_LESS & $mode) {
+        	return $expected > $actual;
+        } else if (Maphper::FIND_BETWEEN & $mode) {
+        	return $expected[0] <= $actual && $actual <= $expected[1];
+        } else if (Maphper::FIND_NOCASE & $mode) {
+        	return strtolower($expected) == strtolower($actual);
+        }
         return $expected == $actual;
     }
 }

maphper/datasource/mock.php

Indentation +58 added lines, -58 removed lines

@@ -2,76 +2,76 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $id;
+	private $data;
+	private $id;
 
-    public function __construct(\ArrayObject $data, $id) {
-        $this->data = $data;
-        $this->id = is_array($id) ? $id : [$id];
-    }
+	public function __construct(\ArrayObject $data, $id) {
+		$this->data = $data;
+		$this->id = is_array($id) ? $id : [$id];
+	}
 
-    public function getPrimaryKey() {
-        return $this->id;
-    }
+	public function getPrimaryKey() {
+		return $this->id;
+	}
 
-    public function findById($id) {
-        return isset($this->data[$id]) ? (array)$this->data[$id] : [];
-    }
+	public function findById($id) {
+		return isset($this->data[$id]) ? (array)$this->data[$id] : [];
+	}
 
-    public function findByField(array $fields, $options = []) {
-        $arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
-        $filteredArray = $arrayFilter->filter($fields);
-        if (isset($options['order'])) {
-            list($columns, $order) = explode(' ', $options['order']);
-            usort($filteredArray, $this->getOrderFunction($order, $columns));
-        }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
-        return $filteredArray;
-    }
+	public function findByField(array $fields, $options = []) {
+		$arrayFilter = new \Maphper\Lib\ArrayFilter(iterator_to_array($this->data->getIterator()));
+		$filteredArray = $arrayFilter->filter($fields);
+		if (isset($options['order'])) {
+			list($columns, $order) = explode(' ', $options['order']);
+			usort($filteredArray, $this->getOrderFunction($order, $columns));
+		}
+		if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
+		if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+		return $filteredArray;
+	}
 
   	public function findAggregate($function, $field, $group = null, array $criteria = [], array $options = []) {
-        return $function($this->findByField($criteria));
-    }
+		return $function($this->findByField($criteria));
+	}
 
   	public function deleteById($id) {
-        unset($this->data[$id]);
-    }
+		unset($this->data[$id]);
+	}
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
-    }
+		foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+	}
 
-    public function save($data) {
-        if (isset($data->{$this->id[0]})) {
-            $id = $data->{$this->id[0]};
-        }
-        else {
-            $id = count($this->data);
-            $data->{$this->id[0]} = $id;
-        }
+	public function save($data) {
+		if (isset($data->{$this->id[0]})) {
+			$id = $data->{$this->id[0]};
+		}
+		else {
+			$id = count($this->data);
+			$data->{$this->id[0]} = $id;
+		}
 
-        $this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
-    }
+		$this->data[$id] = (object)array_merge($this->findById($id), (array)$data);
+	}
 
-    public function getErrors() {
-        return [];
-    }
+	public function getErrors() {
+		return [];
+	}
 
-    private function getOrderFunction($order, $columns) {
-        return function($a, $b) use ($order, $columns) {
-          foreach (explode(',', $columns) as $column) {
-            $aColumn = $a->$column;
-            $bColumn = $b->$column;
-            if ($aColumn === $bColumn) {
-              $sortVal = 0;
-              continue;
-            }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
-            break;
-          }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
-        };
-    }
+	private function getOrderFunction($order, $columns) {
+		return function($a, $b) use ($order, $columns) {
+		  foreach (explode(',', $columns) as $column) {
+			$aColumn = $a->$column;
+			$bColumn = $b->$column;
+			if ($aColumn === $bColumn) {
+			  $sortVal = 0;
+			  continue;
+			}
+			else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
+			break;
+		  }
+		  if ($order === 'desc') return -$sortVal;
+		  else return $sortVal;
+		};
+	}
 }

Braces +17 added lines, -8 removed lines

@@ -25,8 +25,12 @@ 
             list($columns, $order) = explode(' ', $options['order']);
             usort($filteredArray, $this->getOrderFunction($order, $columns));
         }
-        if (isset($options['offset'])) $filteredArray = array_slice($filteredArray, $options['offset']);
-        if (isset($options['limit'])) $filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        if (isset($options['offset'])) {
+        	$filteredArray = array_slice($filteredArray, $options['offset']);
+        }
+        if (isset($options['limit'])) {
+        	$filteredArray = array_slice($filteredArray, 0, $options['limit']);
+        }
         return $filteredArray;
     }
 
@@ -39,14 +43,15 @@ 
     }
 
   	public function deleteByField(array $fields, array $options) {
-        foreach ($this->findByField($fields, $options) as $val) unset($this->data[$val->{$this->id[0]}]);
+        foreach ($this->findByField($fields, $options) as $val) {
+        	unset($this->data[$val->{$this->id[0]}]);
+        }
     }
 
     public function save($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -66,12 +71,16 @@ 
             if ($aColumn === $bColumn) {
               $sortVal = 0;
               continue;
+            } else {
+            	$sortVal = ($aColumn < $bColumn) ? -1 : 1;
             }
-            else $sortVal = ($aColumn < $bColumn) ? -1 : 1;
             break;
           }
-          if ($order === 'desc') return -$sortVal;
-          else return $sortVal;
+          if ($order === 'desc') {
+          	return -$sortVal;
+          } else {
+          	return $sortVal;
+          }
         };
     }
 }