gamernetwork / yolk-support

src/GenericFilter.php

Spacing +32 added lines, -32 removed lines

@@ -61,7 +61,7 @@ 
 	 * Remove all existing criteria from the filter.
 	 * @return self
 	 */
-	public function clear( $what = [] ) {
+	public function clear($what = []) {
 
 		$defaults = [
 			'criteria'  => [],
@@ -72,10 +72,10 @@ 
 
 		$what = (array) $what;
 
-		if( empty($what) )
+		if (empty($what))
 			$what = array_keys($defaults);
 
-		foreach( $what as $k ) {
+		foreach ($what as $k) {
 			$this->$k = $defaults[$k];
 		}
 
@@ -89,7 +89,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function equals( $field, $value ) {
+	public function equals($field, $value) {
 		return $this->addCriteria($field, '=', $value);
 	}
 
@@ -99,7 +99,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function notEquals( $field, $value ) {
+	public function notEquals($field, $value) {
 		return $this->addCriteria($field, '!=', $value);
 	}
 
@@ -109,7 +109,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function lessThan( $field, $value ) {
+	public function lessThan($field, $value) {
 		return $this->addCriteria($field, '<', $value);
 	}
 
@@ -119,7 +119,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function greaterThan( $field, $value ) {
+	public function greaterThan($field, $value) {
 		return $this->addCriteria($field, '>', $value);
 	}
 
@@ -129,7 +129,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function equalsLessThan( $field, $value ) {
+	public function equalsLessThan($field, $value) {
 		return $this->addCriteria($field, '<=', $value);
 	}
 
@@ -139,7 +139,7 @@ 
 	 * @param  string   $value
 	 * @return self
 	 */
-	public function equalsGreaterThan( $field, $value ) {
+	public function equalsGreaterThan($field, $value) {
 		return $this->addCriteria($field, '>=', $value);
 	}
 
@@ -149,7 +149,7 @@ 
 	 * @param  string   $value   pattern to match
 	 * @return self
 	 */
-	public function like( $field, $value ) {
+	public function like($field, $value) {
 		return $this->addCriteria($field, 'LIKE', $value);
 	}
 
@@ -159,7 +159,7 @@ 
 	 * @param  string   $value   pattern to match
 	 * @return self
 	 */
-	public function notLike( $field, $value ) {
+	public function notLike($field, $value) {
 		return $this->addCriteria($field, 'NOT LIKE', $value);
 	}
 
@@ -169,7 +169,7 @@ 
 	 * @param  array          $values    values to match
 	 * @return self
 	 */
-	public function in( $field, array $values ) {
+	public function in($field, array $values) {
 		return $this->addCriteria($field, 'IN', $values);
 	}
 
@@ -179,7 +179,7 @@ 
 	 * @param  array          $values    values to exclude
 	 * @return self
 	 */
-	public function notIn( $field, array $values ) {
+	public function notIn($field, array $values) {
 		return $this->addCriteria($field, 'NOT IN', $values);
 	}
 
@@ -190,16 +190,16 @@ 
 	 * @param  boolean  $dir     true to sort ascending, false to sort descending
 	 * @return self
 	 */
-	public function orderBy( $field, $dir = Filter::SORT_ASC ) {
+	public function orderBy($field, $dir = Filter::SORT_ASC) {
 	
 		$field = trim($field);
 
-		if( empty($field) )
+		if (empty($field))
 			throw new \InvalidArgumentException('No field specified');
 
 		$modifier = substr($field, 0, 1);
 
-		if( in_array($modifier, ['+', '-']) ) {
+		if (in_array($modifier, ['+', '-'])) {
 			$dir = ($modifier == '+');
 			$field = substr($field, 1);
 		}
@@ -215,7 +215,7 @@ 
 	 * @param  integer  $offset
 	 * @return self
 	 */
-	public function offset( $offset ) {
+	public function offset($offset) {
 		$this->offset = max(0, (int) $offset);
 		return $this;
 	}
@@ -225,7 +225,7 @@ 
 	 * @param  integer  $limit
 	 * @return self
 	 */
-	public function limit( $limit )	 {
+	public function limit($limit) {
 		$this->limit = max(1, (int) $limit);
 		return $this;
 	}
@@ -236,47 +236,47 @@ 
 	 * @param  array  $columns a map of field names to database column names
 	 * @return Query
 	 */
-	public function toQuery( Query $query, array $columns = [], $alias = '' ) {
+	public function toQuery(Query $query, array $columns = [], $alias = '') {
 
-		foreach( $this->criteria as $column => $criteria ) {
+		foreach ($this->criteria as $column => $criteria) {
 
-			if( !$column = $this->getColumnName($columns, $column, $alias) )
+			if (!$column = $this->getColumnName($columns, $column, $alias))
 				continue;
 
-			foreach( $criteria as $operator => $value ) {
+			foreach ($criteria as $operator => $value) {
 				$query->where($column, $operator, $value);
 			}
 
 		}
 
-		foreach( $this->getOrder() as $column => $ascending ) {
+		foreach ($this->getOrder() as $column => $ascending) {
 			$column = $this->getColumnName($columns, $column, $alias);
-			if( !$column )
+			if (!$column)
 				continue;
 			$query->orderBy($column, $ascending);
 		}
 
-		if( $this->offset )
+		if ($this->offset)
 			$query->offset($this->offset);
 
-		if( $this->limit )
+		if ($this->limit)
 			$query->limit($this->limit);
 
 		return $query;
 
 	}
 
-	protected function getColumnName( $columns, $column, $alias ) {
+	protected function getColumnName($columns, $column, $alias) {
 
 		$column = isset($columns[$column]) ? $columns[$column] : $column;
 
-		if( !$column )
+		if (!$column)
 			return '';
 
-		elseif( strpos($column, '.') )
+		elseif (strpos($column, '.'))
 			return $column;
 
-		elseif( $alias )
+		elseif ($alias)
 			return "{$alias}.{$column}";
 
 		return $column;
@@ -290,11 +290,11 @@ 
 	 * @param  mixed    $value
 	 * @return self
 	 */
-	protected function addCriteria( $field, $operator, $value ) {
+	protected function addCriteria($field, $operator, $value) {
 
 		$field = trim($field);
 
-		if( !isset($this->criteria[$field]) )
+		if (!isset($this->criteria[$field]))
 			$this->criteria[$field] = [];
 
 		$this->criteria[$field][$operator] = $value;

Braces +28 added lines, -22 removed lines

@@ -72,8 +72,9 @@ 
 
 		$what = (array) $what;
 
-		if( empty($what) )
-			$what = array_keys($defaults);
+		if( empty($what) ) {
+					$what = array_keys($defaults);
+		}
 
 		foreach( $what as $k ) {
 			$this->$k = $defaults[$k];
@@ -194,8 +195,9 @@ 
 	
 		$field = trim($field);
 
-		if( empty($field) )
-			throw new \InvalidArgumentException('No field specified');
+		if( empty($field) ) {
+					throw new \InvalidArgumentException('No field specified');
+		}
 
 		$modifier = substr($field, 0, 1);
 
@@ -240,8 +242,9 @@ 
 
 		foreach( $this->criteria as $column => $criteria ) {
 
-			if( !$column = $this->getColumnName($columns, $column, $alias) )
-				continue;
+			if( !$column = $this->getColumnName($columns, $column, $alias) ) {
+							continue;
+			}
 
 			foreach( $criteria as $operator => $value ) {
 				$query->where($column, $operator, $value);
@@ -251,16 +254,19 @@ 
 
 		foreach( $this->getOrder() as $column => $ascending ) {
 			$column = $this->getColumnName($columns, $column, $alias);
-			if( !$column )
-				continue;
+			if( !$column ) {
+							continue;
+			}
 			$query->orderBy($column, $ascending);
 		}
 
-		if( $this->offset )
-			$query->offset($this->offset);
+		if( $this->offset ) {
+					$query->offset($this->offset);
+		}
 
-		if( $this->limit )
-			$query->limit($this->limit);
+		if( $this->limit ) {
+					$query->limit($this->limit);
+		}
 
 		return $query;
 
@@ -270,14 +276,13 @@ 
 
 		$column = isset($columns[$column]) ? $columns[$column] : $column;
 
-		if( !$column )
-			return '';
-
-		elseif( strpos($column, '.') )
-			return $column;
-
-		elseif( $alias )
-			return "{$alias}.{$column}";
+		if( !$column ) {
+					return '';
+		} elseif( strpos($column, '.') ) {
+					return $column;
+		} elseif( $alias ) {
+					return "{$alias}.{$column}";
+		}
 
 		return $column;
 
@@ -294,8 +299,9 @@ 
 
 		$field = trim($field);
 
-		if( !isset($this->criteria[$field]) )
-			$this->criteria[$field] = [];
+		if( !isset($this->criteria[$field]) ) {
+					$this->criteria[$field] = [];
+		}
 
 		$this->criteria[$field][$operator] = $value;
 

src/BaseConfig.php

Spacing +14 added lines, -14 removed lines

@@ -33,16 +33,16 @@ 
  */
 class BaseConfig extends collections\BaseDictionary implements Config {
 
-	public function load( $file, $key = '' ) {
+	public function load($file, $key = '') {
 
 		$config = [];
 
 		require $file;
 
-		if( !isset($config) || !is_array($config) )
+		if (!isset($config) || !is_array($config))
 			throw new \LogicException('Invalid Configuration');
 
-		if( empty($key)  )
+		if (empty($key))
 			$this->merge($config);
 		else
 			$this->set($key, $config);
@@ -51,17 +51,17 @@ 
 
 	}
 
-	public function has( $key ) {
+	public function has($key) {
 		return $this->get($key) !== null;
 	}
 
-	public function get( $key, $default = null ) {
+	public function get($key, $default = null) {
 		
 		$parts   = explode('.', $key);
 		$context = &$this->items;
 
-		foreach( $parts as $part ) {
-			if( !isset($context[$part]) ) {
+		foreach ($parts as $part) {
+			if (!isset($context[$part])) {
 				return $default;
 			}
 			$context = &$context[$part];
@@ -71,20 +71,20 @@ 
 
 	}
 
-	public function set( $key, $value ) {
+	public function set($key, $value) {
 
 		$parts   = explode('.', $key);
 		$count   = count($parts) - 1;
 		$context = &$this->items;
 
-		for( $i = 0; $i <= $count; $i++ ) {
+		for ($i = 0; $i <= $count; $i++) {
 			$part = $parts[$i];
-			if( !isset($context[$part]) && ($i < $count) ) {
+			if (!isset($context[$part]) && ($i < $count)) {
 				$context[$part] = [];
 			}
-			elseif( $i == $count ) {
+			elseif ($i == $count) {
 				$context[$part] = $value;
-				if( $parts[0] == 'php' ) {
+				if ($parts[0] == 'php') {
 					ini_set($part, $value);
 				}
 				return $this;
@@ -96,9 +96,9 @@ 
 
 	}
 
-	public function merge( array $config ) {
+	public function merge(array $config) {
 
-		foreach( $config as $k => $v ) {
+		foreach ($config as $k => $v) {
 			$this->set($k, $v);
 		}
 

Braces +9 added lines, -8 removed lines

@@ -39,13 +39,15 @@ 
 
 		require $file;
 
-		if( !isset($config) || !is_array($config) )
-			throw new \LogicException('Invalid Configuration');
+		if( !isset($config) || !is_array($config) ) {
+					throw new \LogicException('Invalid Configuration');
+		}
 
-		if( empty($key)  )
-			$this->merge($config);
-		else
-			$this->set($key, $config);
+		if( empty($key)  ) {
+					$this->merge($config);
+		} else {
+					$this->set($key, $config);
+		}
 
 		return $this;
 
@@ -81,8 +83,7 @@ 
 			$part = $parts[$i];
 			if( !isset($context[$part]) && ($i < $count) ) {
 				$context[$part] = [];
-			}
-			elseif( $i == $count ) {
+			} elseif( $i == $count ) {
 				$context[$part] = $value;
 				if( $parts[0] == 'php' ) {
 					ini_set($part, $value);

src/Fieldset.php

Spacing +13 added lines, -13 removed lines

@@ -38,9 +38,9 @@ 
 	 * @param  array    $rules   an array of validation rules
 	 * @return self
 	 */
-	public function add( $name, $type = Type::TEXT, $rules = [] ) {
+	public function add($name, $type = Type::TEXT, $rules = []) {
 		$this->fields[$name] = new Field($name, $type, $rules);
-		$this->types = [];	// clear this so it will be refreshed when we've finished adding fields
+		$this->types = []; // clear this so it will be refreshed when we've finished adding fields
 		return $this;
 	}
 
@@ -49,18 +49,18 @@ 
 	 * @param  array $data
 	 * @return array first element is an array of cleaned data, second is an array of the errors (if any)
 	 */
-	public function validate( array $data ) {
+	public function validate(array $data) {
 
 		$errors = [];
 
-		foreach( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			$f = $field->name;
 			$v = isset($data[$f]) ? $data[$f] : null;
 
 			list($clean, $errors[$f]) = $field->validate($v);
 
-			if( !$errors[$f] )
+			if (!$errors[$f])
 				$data[$f] = $clean;
 
 		}
@@ -78,17 +78,17 @@ 
 
 	public function getDefaults() {
 		$defaults = [];
-		foreach( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 			$defaults[$field->name] = $field->default;
 		}
 		return $defaults;
 	}
 
-	public function __get( $key ) {
+	public function __get($key) {
 		return isset($this->fields[$key]) ? $this->fields[$key] : null;
 	}
 
-	public function __isset( $key ) {
+	public function __isset($key) {
 		return isset($this->fields[$key]);
 	}
 
@@ -100,20 +100,20 @@ 
 		return count($this->fields);
 	}
 
-	public function getByType( $type ) {
+	public function getByType($type) {
 
 		$type = strtolower($type);
 
-		if( !$this->types ) {
+		if (!$this->types) {
 			$this->types['unique'] = [];
-			foreach( $this->fields as $field ) {
+			foreach ($this->fields as $field) {
 
-				if( !isset($this->types[$field->type]) )
+				if (!isset($this->types[$field->type]))
 					$this->types[$field->type] = [];
 
 				$this->types[$field->type][] = $field->name;
 
-				if( $field->isUnique() )
+				if ($field->isUnique())
 					$this->types['unique'][] = $field->name;
 
 			}

Braces +9 added lines, -6 removed lines

@@ -60,8 +60,9 @@ 
 
 			list($clean, $errors[$f]) = $field->validate($v);
 
-			if( !$errors[$f] )
-				$data[$f] = $clean;
+			if( !$errors[$f] ) {
+							$data[$f] = $clean;
+			}
 
 		}
 
@@ -108,13 +109,15 @@ 
 			$this->types['unique'] = [];
 			foreach( $this->fields as $field ) {
 
-				if( !isset($this->types[$field->type]) )
-					$this->types[$field->type] = [];
+				if( !isset($this->types[$field->type]) ) {
+									$this->types[$field->type] = [];
+				}
 
 				$this->types[$field->type][] = $field->name;
 
-				if( $field->isUnique() )
-					$this->types['unique'][] = $field->name;
+				if( $field->isUnique() ) {
+									$this->types['unique'][] = $field->name;
+				}
 
 			}
 		}

src/exceptions/ValidationException.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 

 	protected $errors = [];

 

-	public function __construct( array $errors, $source, \Exception $previous = null ) {

+	public function __construct(array $errors, $source, \Exception $previous = null) {

 		parent::__construct("Validation Error: {$source}");

 		$this->errors = $errors;

 	}

src/collections/BaseCollection.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 	protected $items;
 
-	public function __construct( array $items = [] ) {
+	public function __construct(array $items = []) {
 		$this->items = $items;
 	}
 
@@ -40,7 +40,7 @@ 
 		return $this;
 	}
 
-	public function contains( $item ) {
+	public function contains($item) {
 		return array_search($item, $this->items) !== false;
 	}
 

src/collections/BaseDictionary.php

Spacing +4 added lines, -4 removed lines

@@ -18,15 +18,15 @@ 
  */
 class BaseDictionary extends BaseCollection implements Dictionary {
 
-	public function has( $key ) {
+	public function has($key) {
 		return array_key_exists($key, $this->items);
 	}
 
-	public function get( $key, $default = null ) {
+	public function get($key, $default = null) {
 		return isset($this->items[$key]) ? $this->items[$key] : $default;
 	}
 
-	public function set( $key, $item ) {
+	public function set($key, $item) {
 
 		$current = $this->get($key);
 
@@ -36,7 +36,7 @@ 
 
 	}
 
-	public function remove( $key ) {
+	public function remove($key) {
 		$current = $this->get($key);
 		unset($this->items[$key]);
 		return $current;

src/collections/BaseSet.php

Spacing +4 added lines, -4 removed lines

@@ -18,21 +18,21 @@
  */
 class BaseSet extends BaseCollection implements Set {
 
-	public function add( $item ) {
+	public function add($item) {
 
 		$new = !$this->contains($item);
 
-		if( $new )
+		if ($new)
 			$this->items[] = $item;
 
 		return $new;
 	}
 
-	public function remove( $item ) {
+	public function remove($item) {
 
 		$key = array_search($item, $this->items);
 
-		if( $key !== false )
+		if ($key !== false)
 			unset($this->items[$key]);
 
 		return $key !== false;

Braces +6 added lines, -4 removed lines

@@ -22,8 +22,9 @@ 
 
 		$new = !$this->contains($item);
 
-		if( $new )
-			$this->items[] = $item;
+		if( $new ) {
+					$this->items[] = $item;
+		}
 
 		return $new;
 	}
@@ -32,8 +33,9 @@ 
 
 		$key = array_search($item, $this->items);
 
-		if( $key !== false )
-			unset($this->items[$key]);
+		if( $key !== false ) {
+					unset($this->items[$key]);
+		}
 
 		return $key !== false;
 

src/Field.php

Indentation +14 added lines, -14 removed lines

@@ -29,7 +29,7 @@ 
 
 	protected $default;
 
-    protected $label;
+	protected $label;
 
 	protected $rules;
 
@@ -43,7 +43,7 @@ 
 			'required' => false,
 			'nullable' => false,
 			'default'  => '',
-            'label'    => $name,
+			'label'    => $name,
 		];
 		$rules += $defaults;
 
@@ -66,17 +66,17 @@ 
 		return isset($this->$key) || isset($this->rules[$key]);
 	}
 
-    public function toArray() {
-        return [
-            'name'     => $this->name,
-            'type'     => $this->type,
-            'required' => $this->required,
-            'nullable' => $this->nullable,
-            'default'  => $this->default,
-            'label'    => $this->label,
-            'rules'    => $this->rules,
-        ];
-    }
+	public function toArray() {
+		return [
+			'name'     => $this->name,
+			'type'     => $this->type,
+			'required' => $this->required,
+			'nullable' => $this->nullable,
+			'default'  => $this->default,
+			'label'    => $this->label,
+			'rules'    => $this->rules,
+		];
+	}
 
 	public function isNumeric() {
 		return in_array($this->type, [
@@ -335,7 +335,7 @@ 
 		$this->required = $rules['required'];
 		$this->nullable = $rules['nullable'];
 		$this->default  = $rules['default'];
-        $this->label    = $rules['label'];
+		$this->label    = $rules['label'];
 
 		unset(
 			$rules['required'],

Spacing +41 added lines, -41 removed lines

@@ -33,7 +33,7 @@ 
 
 	protected $rules;
 
-	public function __construct( $name, $type = Type::TEXT, array $rules = [] ) {
+	public function __construct($name, $type = Type::TEXT, array $rules = []) {
 
 		$this->name = $name;
 		$this->type = $type;
@@ -51,18 +51,18 @@ 
 
 	}
 
-	public function __get( $key ) {
-		if( $key == 'default' )
+	public function __get($key) {
+		if ($key == 'default')
 			return $this->getDefault();
-		elseif( isset($this->rules[$key]) )
+		elseif (isset($this->rules[$key]))
 			return $this->rules[$key];
-		elseif( isset($this->$key) )
+		elseif (isset($this->$key))
 			return $this->$key;
 		else
 			return null;
 	}
 
-	public function __isset( $key ) {
+	public function __isset($key) {
 		return isset($this->$key) || isset($this->rules[$key]);
 	}
 
@@ -126,9 +126,9 @@ 
 		return !empty($this->rules['unique']);
 	}
 
-	public function cast( $v ) {
+	public function cast($v) {
 
-		switch( $this->type ) {
+		switch ($this->type) {
 			case Type::INTEGER:
 			case Type::TIMESTAMP:
 			case Type::YEAR:
@@ -145,9 +145,9 @@ 
 				return preg_match('/0000-00-00/', $v) ? '' : $v;
 
 			case Type::JSON:
-				if( !$v )
+				if (!$v)
 					$v = [];
-				elseif( !is_array($v) && is_array($arr = json_decode($v, true)) )
+				elseif (!is_array($v) && is_array($arr = json_decode($v, true)))
 					$v = $arr;
 				return $v;
 
@@ -157,17 +157,17 @@ 
 
 	}
 
-	public function validate( $v ) {
+	public function validate($v) {
 
-		if( $this->required && Validator::isEmpty($v, $this->type) )
+		if ($this->required && Validator::isEmpty($v, $this->type))
 			return [$v, Error::REQUIRED];
 
-		elseif( !$this->nullable && ($v === null) )
+		elseif (!$this->nullable && ($v === null))
 			return [$v, Error::NULL];
 
 		list($clean, $error) = $this->validateType($v, $this->type);
 
-		if( $error )
+		if ($error)
 			return [$v, $error];
 		else
 			return $this->validateRules($clean);
@@ -180,17 +180,17 @@ 
 	 */
 	protected function getDefault() {
 		$default = $this->default;
-		if( $default instanceof \Closure )
+		if ($default instanceof \Closure)
 			return $default();
 		else
 			return $this->cast($default);
 	}
 
-	protected function validateType( $v, $type ) {
+	protected function validateType($v, $type) {
 
 		$error = Error::NONE;
 
-		switch( $type ) {
+		switch ($type) {
 
 			case Type::TEXT:
 				$clean = trim((string) $v);
@@ -261,81 +261,81 @@ 
 		}
 
 		// boolean fields will be null on error
-		if( $type == Type::BOOLEAN )
+		if ($type == Type::BOOLEAN)
 			$error = ($clean === null) ? Error::BOOLEAN : Error::NONE;
-		elseif( $clean === false )
+		elseif ($clean === false)
 			$error = Error::getTypeError($type);
 
 		return [$clean, $error];
 
 	}
 
-	protected function validateRules( $v ) {
+	protected function validateRules($v) {
 
-		if( $error = $this->validateRange($v) )
+		if ($error = $this->validateRange($v))
 			return [$v, $error];
 
-		elseif( $error = $this->validateLength($v) )
+		elseif ($error = $this->validateLength($v))
 			return [$v, $error];
 
-		elseif( $error = $this->validateValues($v) )
+		elseif ($error = $this->validateValues($v))
 			return [$v, $error];
 
-		elseif( $error = $this->validateRegex($v) )
+		elseif ($error = $this->validateRegex($v))
 			return [$v, $error];
 
 		return [$v, $error];
 
 	}
 
-	protected function validateRange( $v ) {
+	protected function validateRange($v) {
 
-		if( isset($this->rules['min']) && $v && ($v < $this->rules['min']) )
+		if (isset($this->rules['min']) && $v && ($v < $this->rules['min']))
 			return Error::MIN;
 
-		if( isset($this->rules['max']) && $v && ($v > $this->rules['max']) )
+		if (isset($this->rules['max']) && $v && ($v > $this->rules['max']))
 			return Error::MAX;
 
 		return Error::NONE;
 
 	}
 
-	protected function validateLength( $v ) {
+	protected function validateLength($v) {
 
-		if( isset($this->rules['min_length']) && mb_strlen($v) < $this->rules['min_length'] )
+		if (isset($this->rules['min_length']) && mb_strlen($v) < $this->rules['min_length'])
 			return Error::TOO_SHORT;
 
-		if( isset($this->rules['max_length']) && mb_strlen($v) > $this->rules['max_length'] )
+		if (isset($this->rules['max_length']) && mb_strlen($v) > $this->rules['max_length'])
 			return Error::TOO_LONG;
 
 		return Error::NONE;
 
 	}
 
-	protected function validateRegex( $v ) {
+	protected function validateRegex($v) {
 
-		if( isset($this->rules['regex']) && !preg_match($this->rules['regex'], $v) )
+		if (isset($this->rules['regex']) && !preg_match($this->rules['regex'], $v))
 			return Error::REGEX;
 
 		return Error::NONE;
 
 	}
 
-	protected function validateValues( $v ) {
+	protected function validateValues($v) {
 
-		if( isset($this->rules['values']) && !in_array($v, $this->rules['values']) )
+		if (isset($this->rules['values']) && !in_array($v, $this->rules['values']))
 			return Error::VALUE;
 
 		return Error::NONE;
 
 	}
 
-	protected function processRules( array $rules, $container = 'array' ) {
+	protected function processRules(array $rules, $container = 'array') {
 
 		$this->required = $rules['required'];
 		$this->nullable = $rules['nullable'];
 		$this->default  = $rules['default'];
-        $this->label    = $rules['label'];
+        $this->label = $rules['label'];
 
 		unset(
 			$rules['required'],
@@ -344,10 +344,10 @@ 
 			$rules['label']
 		);
 
-		if( $this->isObject() ) {
+		if ($this->isObject()) {
 
 			// object fields must specify a class
-			if( empty($rules['class']) )
+			if (empty($rules['class']))
 				throw new \LogicException("Missing class name for item: {$this->name}");
 
 			// object fields are nullable by default
@@ -355,10 +355,10 @@ 
 			$this->default  = null;
 
 		}
-		elseif( $this->isCollection() ) {
+		elseif ($this->isCollection()) {
 
 			// collection fields must specify a class
-			if( empty($rules['class']) )
+			if (empty($rules['class']))
 				throw new \LogicException("Missing item class for collection: {$this->name}");
 
 			$rules['container'] = empty($rules['container']) ? $container : $rules['container'];
@@ -368,7 +368,7 @@ 
 
 				$container = $rules['container'];
 
-				if( $container == 'array' )
+				if ($container == 'array')
 					return [];
 				else
 					return new $container($rules['class']);

Braces +73 added lines, -62 removed lines

@@ -52,14 +52,15 @@ 
 	}
 
 	public function __get( $key ) {
-		if( $key == 'default' )
-			return $this->getDefault();
-		elseif( isset($this->rules[$key]) )
-			return $this->rules[$key];
-		elseif( isset($this->$key) )
-			return $this->$key;
-		else
-			return null;
+		if( $key == 'default' ) {
+					return $this->getDefault();
+		} elseif( isset($this->rules[$key]) ) {
+					return $this->rules[$key];
+		} elseif( isset($this->$key) ) {
+					return $this->$key;
+		} else {
+					return null;
+		}
 	}
 
 	public function __isset( $key ) {
@@ -145,10 +146,11 @@ 
 				return preg_match('/0000-00-00/', $v) ? '' : $v;
 
 			case Type::JSON:
-				if( !$v )
-					$v = [];
-				elseif( !is_array($v) && is_array($arr = json_decode($v, true)) )
-					$v = $arr;
+				if( !$v ) {
+									$v = [];
+				} elseif( !is_array($v) && is_array($arr = json_decode($v, true)) ) {
+									$v = $arr;
+				}
 				return $v;
 
 			default:
@@ -159,18 +161,19 @@ 
 
 	public function validate( $v ) {
 
-		if( $this->required && Validator::isEmpty($v, $this->type) )
-			return [$v, Error::REQUIRED];
-
-		elseif( !$this->nullable && ($v === null) )
-			return [$v, Error::NULL];
+		if( $this->required && Validator::isEmpty($v, $this->type) ) {
+					return [$v, Error::REQUIRED];
+		} elseif( !$this->nullable && ($v === null) ) {
+					return [$v, Error::NULL];
+		}
 
 		list($clean, $error) = $this->validateType($v, $this->type);
 
-		if( $error )
-			return [$v, $error];
-		else
-			return $this->validateRules($clean);
+		if( $error ) {
+					return [$v, $error];
+		} else {
+					return $this->validateRules($clean);
+		}
 
 	}
 
@@ -180,10 +183,11 @@ 
 	 */
 	protected function getDefault() {
 		$default = $this->default;
-		if( $default instanceof \Closure )
-			return $default();
-		else
-			return $this->cast($default);
+		if( $default instanceof \Closure ) {
+					return $default();
+		} else {
+					return $this->cast($default);
+		}
 	}
 
 	protected function validateType( $v, $type ) {
@@ -261,10 +265,11 @@ 
 		}
 
 		// boolean fields will be null on error
-		if( $type == Type::BOOLEAN )
-			$error = ($clean === null) ? Error::BOOLEAN : Error::NONE;
-		elseif( $clean === false )
-			$error = Error::getTypeError($type);
+		if( $type == Type::BOOLEAN ) {
+					$error = ($clean === null) ? Error::BOOLEAN : Error::NONE;
+		} elseif( $clean === false ) {
+					$error = Error::getTypeError($type);
+		}
 
 		return [$clean, $error];
 
@@ -272,17 +277,15 @@ 
 
 	protected function validateRules( $v ) {
 
-		if( $error = $this->validateRange($v) )
-			return [$v, $error];
-
-		elseif( $error = $this->validateLength($v) )
-			return [$v, $error];
-
-		elseif( $error = $this->validateValues($v) )
-			return [$v, $error];
-
-		elseif( $error = $this->validateRegex($v) )
-			return [$v, $error];
+		if( $error = $this->validateRange($v) ) {
+					return [$v, $error];
+		} elseif( $error = $this->validateLength($v) ) {
+					return [$v, $error];
+		} elseif( $error = $this->validateValues($v) ) {
+					return [$v, $error];
+		} elseif( $error = $this->validateRegex($v) ) {
+					return [$v, $error];
+		}
 
 		return [$v, $error];
 
@@ -290,11 +293,13 @@ 
 
 	protected function validateRange( $v ) {
 
-		if( isset($this->rules['min']) && $v && ($v < $this->rules['min']) )
-			return Error::MIN;
+		if( isset($this->rules['min']) && $v && ($v < $this->rules['min']) ) {
+					return Error::MIN;
+		}
 
-		if( isset($this->rules['max']) && $v && ($v > $this->rules['max']) )
-			return Error::MAX;
+		if( isset($this->rules['max']) && $v && ($v > $this->rules['max']) ) {
+					return Error::MAX;
+		}
 
 		return Error::NONE;
 
@@ -302,11 +307,13 @@ 
 
 	protected function validateLength( $v ) {
 
-		if( isset($this->rules['min_length']) && mb_strlen($v) < $this->rules['min_length'] )
-			return Error::TOO_SHORT;
+		if( isset($this->rules['min_length']) && mb_strlen($v) < $this->rules['min_length'] ) {
+					return Error::TOO_SHORT;
+		}
 
-		if( isset($this->rules['max_length']) && mb_strlen($v) > $this->rules['max_length'] )
-			return Error::TOO_LONG;
+		if( isset($this->rules['max_length']) && mb_strlen($v) > $this->rules['max_length'] ) {
+					return Error::TOO_LONG;
+		}
 
 		return Error::NONE;
 
@@ -314,8 +321,9 @@ 
 
 	protected function validateRegex( $v ) {
 
-		if( isset($this->rules['regex']) && !preg_match($this->rules['regex'], $v) )
-			return Error::REGEX;
+		if( isset($this->rules['regex']) && !preg_match($this->rules['regex'], $v) ) {
+					return Error::REGEX;
+		}
 
 		return Error::NONE;
 
@@ -323,8 +331,9 @@ 
 
 	protected function validateValues( $v ) {
 
-		if( isset($this->rules['values']) && !in_array($v, $this->rules['values']) )
-			return Error::VALUE;
+		if( isset($this->rules['values']) && !in_array($v, $this->rules['values']) ) {
+					return Error::VALUE;
+		}
 
 		return Error::NONE;
 
@@ -347,19 +356,20 @@ 
 		if( $this->isObject() ) {
 
 			// object fields must specify a class
-			if( empty($rules['class']) )
-				throw new \LogicException("Missing class name for item: {$this->name}");
+			if( empty($rules['class']) ) {
+							throw new \LogicException("Missing class name for item: {$this->name}");
+			}
 
 			// object fields are nullable by default
 			$this->nullable = true;
 			$this->default  = null;
 
-		}
-		elseif( $this->isCollection() ) {
+		} elseif( $this->isCollection() ) {
 
 			// collection fields must specify a class
-			if( empty($rules['class']) )
-				throw new \LogicException("Missing item class for collection: {$this->name}");
+			if( empty($rules['class']) ) {
+							throw new \LogicException("Missing item class for collection: {$this->name}");
+			}
 
 			$rules['container'] = empty($rules['container']) ? $container : $rules['container'];
 
@@ -368,10 +378,11 @@ 
 
 				$container = $rules['container'];
 
-				if( $container == 'array' )
-					return [];
-				else
-					return new $container($rules['class']);
+				if( $container == 'array' ) {
+									return [];
+				} else {
+									return new $container($rules['class']);
+				}
 
 			};
 

src/Validator.php

Spacing +26 added lines, -26 removed lines

@@ -24,16 +24,16 @@ 
 	 * @param  array $args array of arguments pass to the function
 	 * @return boolean
 	 */
-	public static function __callStatic( $name, $args ) {
+	public static function __callStatic($name, $args) {
 
-		$name = 'validate'. substr($name, 2);
+		$name = 'validate'.substr($name, 2);
 
-		if( !method_exists(__CLASS__, $name) )
+		if (!method_exists(__CLASS__, $name))
 			throw new \BadMethodCallException(sprintf("%s::%s()", get_called_class(), $name));
 
 		$failure = ($name == 'validateBoolean') ? null : false;
 
-		switch( count($args) ) {
+		switch (count($args)) {
 			case 1:
 				return static::$name($args[0]) !== $failure;
 			case 2:
@@ -45,12 +45,12 @@ 
 	}
 
 
-	public static function isEmpty( $v, $type = Type::TEXT ) {
+	public static function isEmpty($v, $type = Type::TEXT) {
 
-		if( !$v || (is_scalar($v) && !trim($v)) )
+		if (!$v || (is_scalar($v) && !trim($v)))
 			return true;
 
-		switch( $type ) {
+		switch ($type) {
 
 			case Type::COLLECTION:
 				return count($v) == 0;
@@ -81,7 +81,7 @@ 
 	 * @param  mixed   $v
 	 * @return integer|false
 	 */
-	public static function validateInteger( $v ) {
+	public static function validateInteger($v) {
 		return $v ? filter_var($v, FILTER_VALIDATE_INT) : 0;
 	}
 
@@ -91,7 +91,7 @@ 
 	 * @param  mixed   $v
 	 * @return float|false
 	 */
-	public static function validateFloat( $v ) {
+	public static function validateFloat($v) {
 		return $v ? filter_var($v, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND) : 0;
 	}
 
@@ -101,21 +101,21 @@ 
 	 * @param  mixed   $v
 	 * @return boolean|null
 	 */
-	public static function validateBoolean( $v ) {
+	public static function validateBoolean($v) {
 		// FILTER_VALIDATE_BOOLEAN will return null if passed an actual boolean false
 		return ($v === false) ? $v : filter_var($v, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
 	}
 
-	public static function validateTimestamp( $v ) {
+	public static function validateTimestamp($v) {
 		$ts = filter_var($v, FILTER_VALIDATE_INT);
-		if( $ts === false )
+		if ($ts === false)
 			$ts = strtotime(str_replace('@', ' ', $v));
 		return $ts;
 	}
 
-	public static function validateDateTime( $v, $format = 'Y-m-d H:i:s' ) {
+	public static function validateDateTime($v, $format = 'Y-m-d H:i:s') {
 
-		if( !trim($v) || preg_match('/0000-00-00/', $v) )
+		if (!trim($v) || preg_match('/0000-00-00/', $v))
 			return '';
 
 		$ts = static::validateTimestamp($v);
@@ -124,15 +124,15 @@ 
 
 	}
 
-	public static function validateDate( $v ) {
+	public static function validateDate($v) {
 		return static::validateDateTime($v, 'Y-m-d');
 	}
 
-	public static function validateTime( $v ) {
+	public static function validateTime($v) {
 		return static::validateDateTime($v, 'H:i:s');
 	}
 
-	public static function validateYear( $v, $min = 1900, $max = 2155 ) {
+	public static function validateYear($v, $min = 1900, $max = 2155) {
 		$v = static::validateInteger($v);
 		return ($v >= $min) && ($v <= $max);
 	}
@@ -142,9 +142,9 @@ 
 	 * @param  mixed   $v
 	 * @return string
 	 */
-	public static function validateIP( $v ) {
+	public static function validateIP($v) {
 		// if integer then convert to string
-		if( $ip = filter_var($v, FILTER_VALIDATE_INT) )
+		if ($ip = filter_var($v, FILTER_VALIDATE_INT))
 			$v = long2ip($ip);
 		return filter_var($v, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
 	}
@@ -155,7 +155,7 @@ 
 	 * @param  mixed   $v
 	 * @return string|boolean
 	 */
-	public static function validateEmail( $v ) {
+	public static function validateEmail($v) {
 		return $v ? filter_var($v, FILTER_VALIDATE_EMAIL) : '';
 	}
 
@@ -165,14 +165,14 @@ 
 	 * @param  mixed   $v
 	 * @return string|boolean
 	 */
-	public static function validateURL( $v ) {
+	public static function validateURL($v) {
 		return $v ? filter_var($v, FILTER_VALIDATE_URL) : '';
 	}
 
-	public static function validateJSON( $v ) {
+	public static function validateJSON($v) {
 
 		// if it's a string then try and decode it
-		if( is_string($v) )
+		if (is_string($v))
 			$v = json_decode($v, true);
 		// otherwise check we can encode it - we don't care about the function result
 		else
@@ -182,12 +182,12 @@ 
 
 	}
 
-	public static function validateObject( $v, $class, $nullable = false ) {
+	public static function validateObject($v, $class, $nullable = false) {
 
-		if( $v instanceof $class )
+		if ($v instanceof $class)
 			return $v;
 
-		elseif( $nullable && ($v === null) )
+		elseif ($nullable && ($v === null))
 			return $v;
 
 		return false;

Braces +26 added lines, -19 removed lines

@@ -28,8 +28,9 @@ 
 
 		$name = 'validate'. substr($name, 2);
 
-		if( !method_exists(__CLASS__, $name) )
-			throw new \BadMethodCallException(sprintf("%s::%s()", get_called_class(), $name));
+		if( !method_exists(__CLASS__, $name) ) {
+					throw new \BadMethodCallException(sprintf("%s::%s()", get_called_class(), $name));
+		}
 
 		$failure = ($name == 'validateBoolean') ? null : false;
 
@@ -47,8 +48,9 @@ 
 
 	public static function isEmpty( $v, $type = Type::TEXT ) {
 
-		if( !$v || (is_scalar($v) && !trim($v)) )
-			return true;
+		if( !$v || (is_scalar($v) && !trim($v)) ) {
+					return true;
+		}
 
 		switch( $type ) {
 
@@ -108,15 +110,17 @@ 
 
 	public static function validateTimestamp( $v ) {
 		$ts = filter_var($v, FILTER_VALIDATE_INT);
-		if( $ts === false )
-			$ts = strtotime(str_replace('@', ' ', $v));
+		if( $ts === false ) {
+					$ts = strtotime(str_replace('@', ' ', $v));
+		}
 		return $ts;
 	}
 
 	public static function validateDateTime( $v, $format = 'Y-m-d H:i:s' ) {
 
-		if( !trim($v) || preg_match('/0000-00-00/', $v) )
-			return '';
+		if( !trim($v) || preg_match('/0000-00-00/', $v) ) {
+					return '';
+		}
 
 		$ts = static::validateTimestamp($v);
 
@@ -144,8 +148,9 @@ 
 	 */
 	public static function validateIP( $v ) {
 		// if integer then convert to string
-		if( $ip = filter_var($v, FILTER_VALIDATE_INT) )
-			$v = long2ip($ip);
+		if( $ip = filter_var($v, FILTER_VALIDATE_INT) ) {
+					$v = long2ip($ip);
+		}
 		return filter_var($v, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
 	}
 
@@ -172,11 +177,13 @@ 
 	public static function validateJSON( $v ) {
 
 		// if it's a string then try and decode it
-		if( is_string($v) )
-			$v = json_decode($v, true);
+		if( is_string($v) ) {
+					$v = json_decode($v, true);
+		}
 		// otherwise check we can encode it - we don't care about the function result
-		else
-			json_encode($v);
+		else {
+					json_encode($v);
+		}
 
 		return (json_last_error() === JSON_ERROR_NONE) ? $v : false;
 
@@ -184,11 +191,11 @@ 
 
 	public static function validateObject( $v, $class, $nullable = false ) {
 
-		if( $v instanceof $class )
-			return $v;
-
-		elseif( $nullable && ($v === null) )
-			return $v;
+		if( $v instanceof $class ) {
+					return $v;
+		} elseif( $nullable && ($v === null) ) {
+					return $v;
+		}
 
 		return false;