netfocusinc / argh

src/netfocusinc/argh/ArgumentParser.php

Braces +33 added lines, -16 removed lines

@@ -158,11 +158,15 @@ 
 						//echo "* MATCHED $count \$argv elements *\n";
 						
 						// Empty $argsL; prevent this inner foreach loop from continuing
-						for($i=0; $i<$count; $i++) array_shift($argsL);
+						for($i=0; $i<$count; $i++) {
+							array_shift($argsL);
+						}
 						
 						// Remove (shift) matching elements from $args
 						// These arguments have been consumed by the parser and are no longer needed
-						for($i=0; $i<$count; $i++) array_shift($args);
+						for($i=0; $i<$count; $i++) {
+							array_shift($args);
+						}
  						
  						//
  						// Try yielding Arguments from this Rule
@@ -176,7 +180,9 @@ 
 		 					//? TODO: Validate Arguments before adding them to the Arguments array?
 		 					
 		 					// Add the new Arguments yielded from this Rule
-		 					foreach($yield as $y) $arguments[] = $y;
+		 					foreach($yield as $y) {
+		 						$arguments[] = $y;
+		 					}
 	 						
 	 						// !IMPORTANT! Stop checking Rules
 	 						break; 
@@ -260,9 +266,10 @@ 
 					if( $this->parameterCollection->exists($token) )
 					{	
 						// This Rule will create a single Argument
-						if(count($argument)==0) $argument[0] = new Argument($token);								
-					}
-					else
+						if(count($argument)==0) {
+							$argument[0] = new Argument($token);
+						}
+					} else
 					{
 						// This token does NOT match the flag of any defined parameter
 						// This Rule will NOT yield any arguments
@@ -282,10 +289,11 @@ 
 							if( ARGH_TYPE_BOOLEAN == $this->parameterCollection->get($token{$j})->getParameterType() )
 							{
 								// Create new Argument for each flag
-								if( !array_key_exists($j, $argument) ) $argument[$j] = new Argument($token{$j});
+								if( !array_key_exists($j, $argument) ) {
+									$argument[$j] = new Argument($token{$j});
+								}
 							}
-						}
-						else
+						} else
 						{
 							// A character in $token, does not match a defined Parameter flag
 							// This Rule will NOT yield any arguments
@@ -304,9 +312,10 @@ 
 					if( $this->parameterCollection->exists($token) )
 					{
 						// This Rule will create a single Argument
-						if(count($argument)==0) $argument[0] = new Argument($token); 								
-					}
-					else
+						if(count($argument)==0) {
+							$argument[0] = new Argument($token);
+						}
+					} else
 					{
 						// This token does NOT match the flag of any defined parameter
 						// This Rule will NOT yield any arguments
@@ -320,7 +329,9 @@ 
 					// Usually, the Argument will have already been created by another token in this Rule
 				
 					// If no new Argument created by this Rule yet, create one now
-					if(count($argument)==0) $argument[0] = new Argument();
+					if(count($argument)==0) {
+						$argument[0] = new Argument();
+					}
 					
 					// The new Argument's 'key' should be set by another token in this Rule
 					$argument[0]->setValue($token);
@@ -332,7 +343,9 @@ 
 					// Usually, the Argument will have already been created by another token in this Rule
 				
 					// If no new Argument created by this Rule yet, create one now
-					if(count($argument)==0) $argument[0] = new Argument();
+					if(count($argument)==0) {
+						$argument[0] = new Argument();
+					}
 				
 					// Trim brackets from the $token (list)
 					$token = trim($token, "[]");
@@ -342,7 +355,9 @@ 
 					
 					// Use the $elements array as the 'value' for all new Argument created by this Rule
 					// Usually, this will only apply to a single Argument, unless this Rule contains ARGH_SEMANTICS_FLAGS
-					foreach($argument as &$a) $a->setValue($elements);
+					foreach($argument as &$a) {
+						$a->setValue($elements);
+					}
 				
 					break;
 					
@@ -363,7 +378,9 @@ 
 									// $token matches an option of this ARGH_TYPE_COMMAND Parameter	
 									
 				 					// If no new Argument created by this Rule yet, create one now
-				 					if(count($argument)==0) $argument[0] = new Argument($p->getName(), $token);
+				 					if(count($argument)==0) {
+				 						$argument[0] = new Argument($p->getName(), $token);
+				 					}
 									
 									// Stop searching this Parameters options
 									break;

src/netfocusinc/argh/Rule.php

Braces +13 added lines, -6 removed lines

@@ -80,10 +80,18 @@ 
 		$syntax = null;
 		$semantics = null;
 		
-		if( array_key_exists('name', $attributes) ) $name = $attributes['name'];
-		if( array_key_exists('example', $attributes) ) $example = $attributes['example'];
-		if( array_key_exists('syntax', $attributes) ) $syntax = $attributes['syntax'];
-		if( array_key_exists('semantics', $attributes) ) $semantics = $attributes['semantics'];
+		if( array_key_exists('name', $attributes) ) {
+			$name = $attributes['name'];
+		}
+		if( array_key_exists('example', $attributes) ) {
+			$example = $attributes['example'];
+		}
+		if( array_key_exists('syntax', $attributes) ) {
+			$syntax = $attributes['syntax'];
+		}
+		if( array_key_exists('semantics', $attributes) ) {
+			$semantics = $attributes['semantics'];
+		}
 		
 		return new self($name, $example, $syntax, $semantics);
 
@@ -207,8 +215,7 @@ 
 		if( preg_match($this->syntax(), $string, $tokens) )
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

src/netfocusinc/argh/ArgvPreprocessor.php

Braces +5 added lines, -5 removed lines

@@ -74,7 +74,9 @@ 
 							{
 								// Create a new string for $args $i thru $j
 								$list = "";
-								for($k=$i; $k<=$j; $k++) $list .= $args[$k];
+								for($k=$i; $k<=$j; $k++) {
+									$list .= $args[$k];
+								}
 								
 								//echo "DEBUG: Replace elements $i thru $j with: $list\n";
 								
@@ -83,8 +85,7 @@ 
 								
 								// Stop searching for the end of the list
 								break;
-							}
-							else
+							} else
 							{
 								throw new ArghException(__METHOD__ . ': Syntax Error: Invalid list.');
 							}
@@ -132,8 +133,7 @@ 
 					{
 						// Wrap (space containing) argument in quotes
 						$args[$i] = "'" . $args[$i] . "'";
-					}
-					else
+					} else
 					{
 						// Wrap (space containing) argument value - after '=' sign in quotes
 						

src/netfocusinc/argh/ParameterCollection.php

Braces +8 added lines, -11 removed lines

@@ -146,8 +146,7 @@ 
 			$index = $this->map[$key];
 			
 			return $this->parameters[$index];
-		}
-		else
+		} else
 		{
 			throw new ArghException('Parameter \'' . $key . '\' not in collection');
 		}	
@@ -198,9 +197,10 @@ 
 			$this->map[$param->getName()] = count($this->parameters)-1;
 			
 			// Map the new parameter's 'flag' to its corresponding index in the $parameters array
-			if(!empty($param->getFlag())) $this->map[$param->getFlag()] = count($this->parameters)-1;
-		}
-		else
+			if(!empty($param->getFlag())) {
+				$this->map[$param->getFlag()] = count($this->parameters)-1;
+			}
+		} else
 		{
 			throw(new ArghException(__CLASS__ . ': Parameter \'' . $param->name() . '\' cannot be redefined.'));
 		}
@@ -232,22 +232,19 @@ 
 				{
 					// Call VariableParameters::addValue() method
 					$this->parameters[$this->map[$a->getKey()]]->addValue($a->getValue());
-				}
-				else if( null !== $this->parameters[$this->map[$a->getKey()]]->getValue() )
+				} else if( null !== $this->parameters[$this->map[$a->getKey()]]->getValue() )
 				{
 					//
 					// Do NOT allow a Parameter's value to be redefined
 					//
 					
 					throw(new ArghException(__CLASS__ . ': Parameter \'' . $a->getKey() . '\' value cannot be redefined.'));
-				}
-				else
+				} else
 				{
 					// Set Parameter value	
 					$this->parameters[$this->map[$a->getKey()]]->setValue($a->getValue());
 				}
-			}
-			else
+			} else
 			{
 				throw(new ArghException(__CLASS__ . ': Cannot merge Argument \'' . $a->getKey() . '\'. Parameter not defined.'));
 			}

src/netfocusinc/argh/Parameter.php

Braces +20 added lines, -10 removed lines

@@ -97,12 +97,24 @@ 
 		$options = array();
 		
 		// Extract parameter attributes from array
-		if( array_key_exists('name', $attributes) ) $name = $attributes['name'];
-		if( array_key_exists('flag', $attributes) ) $flag = $attributes['flag'];
-		if( array_key_exists('required', $attributes) ) $required = $attributes['required'];
-		if( array_key_exists('default', $attributes) ) $default = $attributes['default'];
-		if( array_key_exists('description', $attributes) ) $description = $attributes['description'];
-		if( array_key_exists('options', $attributes) ) $options = $attributes['options'];
+		if( array_key_exists('name', $attributes) ) {
+			$name = $attributes['name'];
+		}
+		if( array_key_exists('flag', $attributes) ) {
+			$flag = $attributes['flag'];
+		}
+		if( array_key_exists('required', $attributes) ) {
+			$required = $attributes['required'];
+		}
+		if( array_key_exists('default', $attributes) ) {
+			$default = $attributes['default'];
+		}
+		if( array_key_exists('description', $attributes) ) {
+			$description = $attributes['description'];
+		}
+		if( array_key_exists('options', $attributes) ) {
+			$options = $attributes['options'];
+		}
 		
 		// Construct a new Parameter instance
 		// Late static binding results in new instance of (calling) subclass
@@ -224,8 +236,7 @@ 
 		if(count($this->options) > 0)
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -245,8 +256,7 @@ 
 		if( in_array($value, $this->options) )
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

src/netfocusinc/argh/BooleanParameter.php

Braces +4 added lines, -8 removed lines

@@ -48,8 +48,7 @@ 
 		if( !empty( parent::getDefault() ) )
 		{
 			return TRUE;
-		}	
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -83,18 +82,15 @@ 
 		{
 			// null (no value) considered TRUE (this is how flags work; e.g. the presence of a boolean flag -x without value means TRUE)
 			$this->value = TRUE;
-		}
-		else if( FALSE == $value )
+		} else if( FALSE == $value )
 		{
 			// 'Falsey' (boolean) FALSE, (int) 0, (float 0.0), (string) '0', (string) '', NULL
 			$this->value = FALSE;
-		}
-		else if( in_array($value, array('0', 'false', 'False', 'FALSE', 'off', 'Off', 'OFF')) )
+		} else if( in_array($value, array('0', 'false', 'False', 'FALSE', 'off', 'Off', 'OFF')) )
 		{
 			// Certain character values should be considered to mean FALSE
 			$this->value = FALSE;
-		}
-		else
+		} else
 		{
 			// Everything else considered TRUE
 			$this->value = TRUE;

src/netfocusinc/argh/ListParameter.php

Braces +5 added lines, -5 removed lines

@@ -58,8 +58,7 @@ 
 		if(is_array($value))
 		{
 			$this->value = $value;
-		}
-		else
+		} else
 		{
 			$this->value = array($value);
 		}
@@ -88,11 +87,12 @@ 
 		{
 			// Append new single value to this Parameters value array
 			$this->value[] = $value;
-		}
-		else
+		} else
 		{
 			// Append every new value to this Parameters value array
-			foreach($value as $v) $this->value[] = $v;
+			foreach($value as $v) {
+				$this->value[] = $v;
+			}
 		}
 	}
 	

src/netfocusinc/argh/Argument.php

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
 		if( is_array($this->value) )
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

src/netfocusinc/argh/Argh.php

Braces +5 added lines, -10 removed lines

@@ -139,8 +139,7 @@ 
 		if( $this->parameters->exists($key) )
 		{
 			return TRUE;		
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -213,8 +212,7 @@ 
 			
 			// Merge Arguments into Parameters
 			$this->parameters->mergeArguments($arguments);
-		}
-		catch(ArghException $e)
+		} catch(ArghException $e)
 		{
 			throw $e;
 		}
@@ -241,13 +239,11 @@ 
 			if( array_key_exists($i, $this->argv) )
 			{
 				return $this->argv[$i];
-			}
-			else
+			} else
 			{
 				throw new ArghException('Invalid index for argv');
 			}
-		}
-		else
+		} else
 		{
 			return $this->argv;
 		}
@@ -286,8 +282,7 @@ 
 		{
 			// Return the Parameters value
 			return $this->parameters->get($key)->getValue();
-		}
-		else
+		} else
 		{
 			// Return the Parameters default value, if any
 			return $this->parameters->get($key)->getDefault();