netfocusinc / argh

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->getName() . '\' 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/Language.php

Braces +1 added lines, -2 removed lines

@@ -253,8 +253,7 @@
 		{
 			// Create an array of Rules
 			$this->rules = array();
-		}
-		catch(\Exception $e)
+		} catch(\Exception $e)
 		{
 			throw($e);
 		}