@@ -20,24 +20,24 @@ |
||
20 | 20 | */ |
21 | 21 | class Column |
22 | 22 | { |
23 | - /** |
|
24 | - * @var Calculator |
|
25 | - */ |
|
23 | + /** |
|
24 | + * @var Calculator |
|
25 | + */ |
|
26 | 26 | private $calculator; |
27 | 27 | |
28 | - /** |
|
29 | - * @var string |
|
30 | - */ |
|
28 | + /** |
|
29 | + * @var string |
|
30 | + */ |
|
31 | 31 | private $name; |
32 | 32 | |
33 | - /** |
|
34 | - * @var float |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var float |
|
35 | + */ |
|
36 | 36 | private $value; |
37 | 37 | |
38 | - /** |
|
39 | - * @var boolean |
|
40 | - */ |
|
38 | + /** |
|
39 | + * @var boolean |
|
40 | + */ |
|
41 | 41 | private $missing = false; |
42 | 42 | |
43 | 43 | public function __construct(Calculator $calculator, string $name, float $value) |
@@ -37,24 +37,24 @@ discard block |
||
37 | 37 | |
38 | 38 | use Traits_Optionable; |
39 | 39 | |
40 | - /** |
|
41 | - * @var Column[] |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var Column[] |
|
42 | + */ |
|
43 | 43 | private $columns = array(); |
44 | 44 | |
45 | - /** |
|
46 | - * @var boolean |
|
47 | - */ |
|
45 | + /** |
|
46 | + * @var boolean |
|
47 | + */ |
|
48 | 48 | private $calculated = false; |
49 | 49 | |
50 | - /** |
|
51 | - * @var Operations |
|
52 | - */ |
|
50 | + /** |
|
51 | + * @var Operations |
|
52 | + */ |
|
53 | 53 | private $operations; |
54 | 54 | |
55 | - /** |
|
56 | - * @param array<string,float> $columnValues |
|
57 | - */ |
|
55 | + /** |
|
56 | + * @param array<string,float> $columnValues |
|
57 | + */ |
|
58 | 58 | private function __construct(array $columnValues) |
59 | 59 | { |
60 | 60 | foreach($columnValues as $name => $value) |
@@ -68,20 +68,20 @@ discard block |
||
68 | 68 | $this->operations = new Operations($this); |
69 | 69 | } |
70 | 70 | |
71 | - /** |
|
72 | - * Creates an instance of the calculator. |
|
73 | - * |
|
74 | - * @param array<string,float> $columnValues |
|
75 | - * @return Calculator |
|
76 | - */ |
|
71 | + /** |
|
72 | + * Creates an instance of the calculator. |
|
73 | + * |
|
74 | + * @param array<string,float> $columnValues |
|
75 | + * @return Calculator |
|
76 | + */ |
|
77 | 77 | public static function create(array $columnValues) : Calculator |
78 | 78 | { |
79 | 79 | return new Calculator($columnValues); |
80 | 80 | } |
81 | 81 | |
82 | - /** |
|
83 | - * @return array<string,mixed> |
|
84 | - */ |
|
82 | + /** |
|
83 | + * @return array<string,mixed> |
|
84 | + */ |
|
85 | 85 | public function getDefaultOptions(): array |
86 | 86 | { |
87 | 87 | return array( |
@@ -107,14 +107,14 @@ discard block |
||
107 | 107 | return $this; |
108 | 108 | } |
109 | 109 | |
110 | - /** |
|
111 | - * Sets the minimum width to enforce for columns, |
|
112 | - * when there already are other columns that take |
|
113 | - * up all the available width. |
|
114 | - * |
|
115 | - * @param float $width |
|
116 | - * @return Calculator |
|
117 | - */ |
|
110 | + /** |
|
111 | + * Sets the minimum width to enforce for columns, |
|
112 | + * when there already are other columns that take |
|
113 | + * up all the available width. |
|
114 | + * |
|
115 | + * @param float $width |
|
116 | + * @return Calculator |
|
117 | + */ |
|
118 | 118 | public function setMinWidth(float $width) : Calculator |
119 | 119 | { |
120 | 120 | $max = $this->getMaxMinWidth(); |
@@ -147,10 +147,10 @@ discard block |
||
147 | 147 | $this->columns[] = $col; |
148 | 148 | } |
149 | 149 | |
150 | - /** |
|
151 | - * Retrieves the minimum width for columns, in percent. |
|
152 | - * @return float |
|
153 | - */ |
|
150 | + /** |
|
151 | + * Retrieves the minimum width for columns, in percent. |
|
152 | + * @return float |
|
153 | + */ |
|
154 | 154 | public function getMinWidth() : float |
155 | 155 | { |
156 | 156 | return floatval($this->getOption('minPerCol')); |
@@ -176,11 +176,11 @@ discard block |
||
176 | 176 | $this->calculated = true; |
177 | 177 | } |
178 | 178 | |
179 | - /** |
|
180 | - * Adjusts the individual column values to match |
|
181 | - * the expected output format, for example ensuring |
|
182 | - * integer values if we are in integer mode. |
|
183 | - */ |
|
179 | + /** |
|
180 | + * Adjusts the individual column values to match |
|
181 | + * the expected output format, for example ensuring |
|
182 | + * integer values if we are in integer mode. |
|
183 | + */ |
|
184 | 184 | private function convertToInteger() : void |
185 | 185 | { |
186 | 186 | // convert all columns to integer values as required |
@@ -194,12 +194,12 @@ discard block |
||
194 | 194 | } |
195 | 195 | } |
196 | 196 | |
197 | - /** |
|
198 | - * Retrieves the updated list of column values, |
|
199 | - * retaining the original keys. |
|
200 | - * |
|
201 | - * @return array<string,int|float> |
|
202 | - */ |
|
197 | + /** |
|
198 | + * Retrieves the updated list of column values, |
|
199 | + * retaining the original keys. |
|
200 | + * |
|
201 | + * @return array<string,int|float> |
|
202 | + */ |
|
203 | 203 | public function getValues() : array |
204 | 204 | { |
205 | 205 | $this->calculate(); |
@@ -226,9 +226,9 @@ discard block |
||
226 | 226 | return $this->getBoolOption('integerValues'); |
227 | 227 | } |
228 | 228 | |
229 | - /** |
|
230 | - * @return Column[] |
|
231 | - */ |
|
229 | + /** |
|
230 | + * @return Column[] |
|
231 | + */ |
|
232 | 232 | public function getColumns() : array |
233 | 233 | { |
234 | 234 | return $this->columns; |
@@ -240,12 +240,12 @@ discard block |
||
240 | 240 | $surplus->remove(); |
241 | 241 | } |
242 | 242 | |
243 | - /** |
|
244 | - * Detects any leftover percentages that still need |
|
245 | - * to be filled, in case we are not at 100% yet. It |
|
246 | - * distributes the missing percentages evenly over the |
|
247 | - * available columns, from the last one upwards. |
|
248 | - */ |
|
243 | + /** |
|
244 | + * Detects any leftover percentages that still need |
|
245 | + * to be filled, in case we are not at 100% yet. It |
|
246 | + * distributes the missing percentages evenly over the |
|
247 | + * available columns, from the last one upwards. |
|
248 | + */ |
|
249 | 249 | private function fillLeftover() : void |
250 | 250 | { |
251 | 251 | $filler = new LeftoverFiller($this); |
@@ -30,9 +30,9 @@ |
||
30 | 30 | */ |
31 | 31 | private $operations; |
32 | 32 | |
33 | - /** |
|
34 | - * @var Column[] |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var Column[] |
|
35 | + */ |
|
36 | 36 | private $columns = array(); |
37 | 37 | |
38 | 38 | public function __construct(Calculator $calculator) |
@@ -21,14 +21,14 @@ |
||
21 | 21 | */ |
22 | 22 | class OverflowFixer |
23 | 23 | { |
24 | - /** |
|
25 | - * @var Calculator |
|
26 | - */ |
|
24 | + /** |
|
25 | + * @var Calculator |
|
26 | + */ |
|
27 | 27 | private $calculator; |
28 | 28 | |
29 | - /** |
|
30 | - * @var Operations |
|
31 | - */ |
|
29 | + /** |
|
30 | + * @var Operations |
|
31 | + */ |
|
32 | 32 | private $operations; |
33 | 33 | |
34 | 34 | public function __construct(Calculator $calculator) |
@@ -32,14 +32,14 @@ |
||
32 | 32 | */ |
33 | 33 | private $operations; |
34 | 34 | |
35 | - /** |
|
36 | - * @var float |
|
37 | - */ |
|
35 | + /** |
|
36 | + * @var float |
|
37 | + */ |
|
38 | 38 | private $leftover = 0; |
39 | 39 | |
40 | - /** |
|
41 | - * @var float |
|
42 | - */ |
|
40 | + /** |
|
41 | + * @var float |
|
42 | + */ |
|
43 | 43 | private $baseTotal = 0; |
44 | 44 | |
45 | 45 | public function __construct(Calculator $calculator) |
@@ -36,9 +36,9 @@ |
||
36 | 36 | */ |
37 | 37 | private $missing = 0; |
38 | 38 | |
39 | - /** |
|
40 | - * @var Column[] |
|
41 | - */ |
|
39 | + /** |
|
40 | + * @var Column[] |
|
41 | + */ |
|
42 | 42 | private $columns = array(); |
43 | 43 | |
44 | 44 | public function __construct(Calculator $calculator) |
@@ -30,9 +30,9 @@ |
||
30 | 30 | */ |
31 | 31 | private $operations; |
32 | 32 | |
33 | - /** |
|
34 | - * @var integer |
|
35 | - */ |
|
33 | + /** |
|
34 | + * @var integer |
|
35 | + */ |
|
36 | 36 | private $missing = 0; |
37 | 37 | |
38 | 38 | public function __construct(Calculator $calculator) |