gamernetwork / yolk-support

src/GenericFilter.php

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

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

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/collections/BaseSet.php

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

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

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;
 

src/TwigExtension.php

Braces +6 added lines, -4 removed lines

@@ -33,8 +33,9 @@ 
 			}),
 			new \Twig_SimpleTest('object', function( $value, $class = '' ) {
 				$result = is_object($value);
-				if( $class )
-					$result = $result && ($value instanceof $class);
+				if( $class ) {
+									$result = $result && ($value instanceof $class);
+				}
 				return $result;
 			}),
 		];
@@ -46,8 +47,9 @@ 
 			new \Twig_SimpleFilter('md5', 'md5'),
 			new \Twig_SimpleFilter('sha1', 'sha1'),
 			new \Twig_SimpleFilter('truncate', function( $str, $length, $replace = '...' ) {
-		        if( isset($str) )
-	        		return strlen($str) <= $length ? $str : substr($str, 0, $length - strip_tags($replace)) . $replace;
+		        if( isset($str) ) {
+		        	        		return strlen($str) <= $length ? $str : substr($str, 0, $length - strip_tags($replace)) . $replace;
+		        }
         		return null;
 			}),
 			new \Twig_SimpleFilter('sum', 'array_sum'),