@@ -9,7 +9,7 @@ |
||
| 9 | 9 | const COMMA = self::SPACES . ',' . self::SPACES; |
| 10 | 10 | const PIPE = self::SPACES . '\|' . self::SPACES; |
| 11 | 11 | const NUMBER = '(-?\d*\.?\d+)'; |
| 12 | - const NUMBER_OR_PERCENT = '('. self::NUMBER . '%?)'; //'((-?\d*\.?\d+)%?)'; |
|
| 12 | + const NUMBER_OR_PERCENT = '(' . self::NUMBER . '%?)'; //'((-?\d*\.?\d+)%?)'; |
|
| 13 | 13 | const PERCENT = self::NUMBER . '%'; |
| 14 | 14 | const POSITIVE_NUMBER = '(\d*\.?\d+)'; |
| 15 | 15 | const POSITIVE_NUMBER_OR_ASTERISK = '(\d*\.?\d+|\*)'; |
@@ -37,12 +37,12 @@ |
||
| 37 | 37 | |
| 38 | 38 | if ($amount === '*') { |
| 39 | 39 | $percentageCtxt->setAmount(floatval($billableAmount)) |
| 40 | - ->setStructure($matches[1] . ', 1 - * '); |
|
| 40 | + ->setStructure($matches[1] . ', 1 - * '); |
|
| 41 | 41 | $bill += $percentageBillInterpreter->interpret($percentageCtxt); |
| 42 | 42 | } else { |
| 43 | 43 | $billableAmount -= $amount; |
| 44 | 44 | $percentageCtxt->setAmount($amount) |
| 45 | - ->setStructure($matches[1] . ', 1 - * '); |
|
| 45 | + ->setStructure($matches[1] . ', 1 - * '); |
|
| 46 | 46 | $bill += $percentageBillInterpreter->interpret($percentageCtxt); |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | final class SteppedBillInterpreter extends AbstractBillInterpreter |
| 26 | 26 | { |
| 27 | - private const EXPRESSION = Expr::POSITIVE_NUMBER . |
|
| 27 | + private const EXPRESSION = Expr::POSITIVE_NUMBER . |
|
| 28 | 28 | Expr::COMMA . |
| 29 | 29 | Expr::POSITIVE_NUMBER . |
| 30 | 30 | '\+'; |
@@ -23,8 +23,8 @@ |
||
| 23 | 23 | use RangeValidityCheck; |
| 24 | 24 | |
| 25 | 25 | private const EXPRESSION = Expr::POSITIVE_NUMBER . |
| 26 | - Expr::COMMA . |
|
| 27 | - Expr::RANGE; |
|
| 26 | + Expr::COMMA . |
|
| 27 | + Expr::RANGE; |
|
| 28 | 28 | |
| 29 | 29 | public function __construct() |
| 30 | 30 | { |
@@ -23,8 +23,8 @@ |
||
| 23 | 23 | use RangeValidityCheck; |
| 24 | 24 | |
| 25 | 25 | private const EXPRESSION = Expr::PERCENT . |
| 26 | - Expr::COMMA . |
|
| 27 | - Expr::RANGE; |
|
| 26 | + Expr::COMMA . |
|
| 27 | + Expr::RANGE; |
|
| 28 | 28 | |
| 29 | 29 | public function __construct() |
| 30 | 30 | { |