rudiedirkx / units

lib/Quantity.php

Spacing +19 added lines, -19 removed lines

@@ -15,7 +15,7 @@ 
 	/**
 	 * Convert without the bother of an object
 	 */
-	static public function convert( $amount, $fromUnit, $toUnit ) {
+	static public function convert($amount, $fromUnit, $toUnit) {
 		$quantity = new static($amount, $fromUnit);
 		return $quantity->to($toUnit);
 	}
@@ -23,9 +23,9 @@ 
 	/**
 	 * Check if the given unit is valid for this quantity
 	 */
-	static public function validUnit( $unit ) {
+	static public function validUnit($unit) {
 		$units = static::$units;
-		if ( isset($units[0]) ) {
+		if (isset($units[0])) {
 			return in_array($unit, $units);
 		}
 
@@ -41,9 +41,9 @@ 
 	/**
 	 *
 	 */
-	public function __construct( $amount, $unit = null, $convertToDefault = true ) {
+	public function __construct($amount, $unit = null, $convertToDefault = true) {
 		// Invalid unit!
-		if ( $unit && !static::validUnit($unit) ) {
+		if ($unit && !static::validUnit($unit)) {
 			$quantity = (new \ReflectionClass(get_called_class()))->getShortName();
 			throw new ConversionException("Can't import '$quantity' as '$unit'.");
 		}
@@ -54,7 +54,7 @@ 
 		$this->original_unit = $this->unit;
 
 		// Convert incoming unit into storage unit
-		if ( $convertToDefault && $this->unit != $this::$default_unit ) {
+		if ($convertToDefault && $this->unit != $this::$default_unit) {
 			$this->amount = $this->to($this::$default_unit);
 			$this->unit = $this::$default_unit;
 		}
@@ -63,8 +63,8 @@ 
 	/**
 	 * Convert object amount to another unit, and return, don't save
 	 */
-	public function to( $toUnit ) {
-		if ( $toUnit === 'base' ) {
+	public function to($toUnit) {
+		if ($toUnit === 'base') {
 			$toUnit = static::BASE_UNIT;
 		}
 
@@ -74,14 +74,14 @@ 
 	/**
 	 * The convertor heart, that every sub class needs
 	 */
-	abstract protected function convertor( $toUnit );
+	abstract protected function convertor($toUnit);
 
 	/**
 	 * The default convertor, using the Quantity's conversion table
 	 */
-	protected function convertUsingTable( $toUnit ) {
+	protected function convertUsingTable($toUnit) {
 		// Invalid unit!
-		if ( !$this::validUnit($toUnit) ) {
+		if (!$this::validUnit($toUnit)) {
 			$quantity = (new \ReflectionClass($this))->getShortName();
 			throw new ConversionException("Can't convert '$quantity' to '$toUnit'.");
 		}
@@ -102,15 +102,15 @@ 
 	/**
 	 * Advanded convertor, using unit-base-unit methods
 	 */
-	protected function convertUsingMethods( $toUnit ) {
+	protected function convertUsingMethods($toUnit) {
 		$amount = $this->amount;
 
-		if ( $this->unit != $this::BASE_UNIT ) {
-			$amount = call_user_func(array($this, $this->unit . 'to' . $this::BASE_UNIT), $amount);
+		if ($this->unit != $this::BASE_UNIT) {
+			$amount = call_user_func(array($this, $this->unit.'to'.$this::BASE_UNIT), $amount);
 		}
 
-		if ( $this::BASE_UNIT != $toUnit ) {
-			$amount = call_user_func(array($this, $this::BASE_UNIT . 'to' . $toUnit), $amount);
+		if ($this::BASE_UNIT != $toUnit) {
+			$amount = call_user_func(array($this, $this::BASE_UNIT.'to'.$toUnit), $amount);
 		}
 
 		return $amount;
@@ -119,7 +119,7 @@ 
 	/**
 	 * Convert the object to another standard unit
 	 */
-	public function convertTo( $unit ) {
+	public function convertTo($unit) {
 		$this->amount = $this->to($unit);
 		$this->unit = $unit;
 	}
@@ -129,8 +129,8 @@ 
 	 */
 	public function all() {
 		$all = array();
-		foreach ( $this::$units as $unit => $conversion ) {
-			if ( is_int($unit) ) {
+		foreach ($this::$units as $unit => $conversion) {
+			if (is_int($unit)) {
 				$unit = $conversion;
 			}