Level-2 / Maphper

Maphper/DataSource/Mock.php

Indentation +90 added lines, -90 removed lines

@@ -2,100 +2,100 @@
 namespace Maphper\DataSource;
 use Maphper\Maphper;
 class Mock implements \Maphper\DataSource {
-    private $data;
-    private $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 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;
-    }
+	private $data;
+	private $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 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 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) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
-
-            unset($this->data[$id]);
-        }
-    }
-
-    public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
-    }
-
-    private function saveSinglePk($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);
-    }
-
-    private function saveMultiPk($data) {
-        $saveId = $this->getMultiPkSaveId($data);
-
-        $this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
-    }
-
-    private function getMultiPkSaveId($data) {
-        $keyVals = [];
-        foreach ($this->id as $keyName) {
-            $keyVals[] = $data->$keyName;
-        }
-        return implode(',', $keyVals);
-    }
-
-    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;
-        };
-    }
+		foreach ($this->findByField($fields, $options) as $val) {
+			if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
+			else $id = $val->{$this->id[0]};
+
+			unset($this->data[$id]);
+		}
+	}
+
+	public function save($data) {
+		if (count($this->id) > 1) return $this->saveMultiPk($data);
+		else return $this->saveSinglePk($data);
+	}
+
+	private function saveSinglePk($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);
+	}
+
+	private function saveMultiPk($data) {
+		$saveId = $this->getMultiPkSaveId($data);
+
+		$this->data[$saveId] = (object)array_merge($this->findById($saveId), (array)$data);
+	}
+
+	private function getMultiPkSaveId($data) {
+		$keyVals = [];
+		foreach ($this->id as $keyName) {
+			$keyVals[] = $data->$keyName;
+		}
+		return implode(',', $keyVals);
+	}
+
+	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;
+		};
+	}
 }

Braces +24 added lines, -11 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;
     }
 
@@ -40,23 +44,28 @@ 
 
   	public function deleteByField(array $fields, array $options) {
         foreach ($this->findByField($fields, $options) as $val) {
-            if (count($this->id) > 1) $id = $this->getMultiPkSaveId($val);
-            else $id = $val->{$this->id[0]};
+            if (count($this->id) > 1) {
+            	$id = $this->getMultiPkSaveId($val);
+            } else {
+            	$id = $val->{$this->id[0]};
+            }
 
             unset($this->data[$id]);
         }
     }
 
     public function save($data) {
-        if (count($this->id) > 1) return $this->saveMultiPk($data);
-        else return $this->saveSinglePk($data);
+        if (count($this->id) > 1) {
+        	return $this->saveMultiPk($data);
+        } else {
+        	return $this->saveSinglePk($data);
+        }
     }
 
     private function saveSinglePk($data) {
         if (isset($data->{$this->id[0]})) {
             $id = $data->{$this->id[0]};
-        }
-        else {
+        } else {
             $id = count($this->data);
             $data->{$this->id[0]} = $id;
         }
@@ -90,12 +99,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;
+          }
         };
     }
 }