Skip to content

Commit f28d1ad

Browse files
[4.x] Fix callable type for beforeEach and afterEach methods
Closes #40
1 parent d5c70b7 commit f28d1ad

10 files changed

Lines changed: 23 additions & 19 deletions

File tree

src/Benchmark.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ public static function start(): static
5353
return new static;
5454
}
5555

56-
public function beforeEach(callable $callback): self
56+
public function beforeEach(Closure $callback): self
5757
{
5858
$this->beforeEach = $callback;
5959

6060
return $this;
6161
}
6262

63-
public function afterEach(callable $callback): self
63+
public function afterEach(Closure $callback): self
6464
{
6565
$this->afterEach = $callback;
6666

@@ -81,7 +81,7 @@ public function round(?int $precision): self
8181
return $this;
8282
}
8383

84-
public function compare(array|callable ...$callbacks): void
84+
public function compare(array|Closure ...$callbacks): void
8585
{
8686
$values = is_array($callbacks[0]) ? $callbacks[0] : func_get_args();
8787

@@ -113,14 +113,14 @@ protected function chunks(array $callbacks, ProgressBarService $progressBar): vo
113113
}
114114
}
115115

116-
protected function each(mixed $name, callable $callback, ProgressBarService $progressBar): void
116+
protected function each(mixed $name, Closure $callback, ProgressBarService $progressBar): void
117117
{
118118
$this->result['total'][$name] = $this->call(
119119
fn () => $this->run($name, $callback, $progressBar)
120120
);
121121
}
122122

123-
protected function run(mixed $name, callable $callback, ProgressBarService $progressBar): void
123+
protected function run(mixed $name, Closure $callback, ProgressBarService $progressBar): void
124124
{
125125
for ($i = 1; $i <= $this->iterations; ++$i) {
126126
$result = $this->runCallback($this->beforeEach, $name, $i);
@@ -144,7 +144,7 @@ protected function runCallback(?Closure $callback, mixed ...$arguments): mixed
144144
return $callback(...$arguments);
145145
}
146146

147-
protected function call(callable $callback, array $parameters = []): array
147+
protected function call(Closure $callback, array $parameters = []): array
148148
{
149149
return $this->runner->call($callback, $parameters);
150150
}

src/Services/Arr.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace DragonCode\Benchmark\Services;
66

7+
use Closure;
78
use DragonCode\Support\Facades\Helpers\Arr as DragonArray;
89

910
use function array_flip;
@@ -27,7 +28,7 @@ public function forget(array $data, mixed $key): array
2728
return $data;
2829
}
2930

30-
public function map(array $data, callable $callback): array
31+
public function map(array $data, Closure $callback): array
3132
{
3233
return array_map($callback, array_values($data), array_keys($data));
3334
}

src/Services/MeasurementError.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class MeasurementError
1414
protected int $minCount = 10;
1515

1616
public function __construct(
17-
protected Arr $arr = new Arr()
17+
protected Arr $arr = new Arr
1818
) {}
1919

2020
public function filter(array $data): array

src/Services/Runner.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44

55
namespace DragonCode\Benchmark\Services;
66

7+
use Closure;
8+
79
use function hrtime;
810

911
class Runner
1012
{
1113
public function __construct(
12-
protected readonly Memory $memory = new Memory()
14+
protected readonly Memory $memory = new Memory
1315
) {}
1416

15-
public function call(callable $callback, array $parameters = []): array
17+
public function call(Closure $callback, array $parameters = []): array
1618
{
1719
$this->clean();
1820

@@ -24,7 +26,7 @@ protected function clean(): void
2426
$this->memory->reset();
2527
}
2628

27-
protected function run(callable $callback, array $parameters = []): array
29+
protected function run(Closure $callback, array $parameters = []): array
2830
{
2931
$ramFrom = $this->memory->now();
3032
$startAt = hrtime(true);

src/Services/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class View
2323

2424
public function __construct(
2525
protected SymfonyStyle $io,
26-
protected Memory $memory = new Memory()
26+
protected Memory $memory = new Memory
2727
) {
2828
$this->table = new Table($this->io);
2929
$this->progressBar = new ProgressBar($this->io);

src/Transformers/Base.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44

55
namespace DragonCode\Benchmark\Transformers;
66

7+
use Closure;
78
use DragonCode\Benchmark\Contracts\Transformer as TransformerContract;
89

910
abstract class Base implements TransformerContract
1011
{
11-
protected function put(array &$items, string $key, mixed $name, callable $callback): void
12+
protected function put(array &$items, string $key, mixed $name, Closure $callback): void
1213
{
1314
$items[$key]['#'] = $key;
1415
$items[$key][$name] = $callback();

src/Transformers/Separator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ class Separator extends Base
1010
{
1111
public function transform(array $data): array
1212
{
13-
return [new TableSeparator()];
13+
return [new TableSeparator];
1414
}
1515
}

src/Transformers/Stats.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class Stats extends Base
2222
];
2323

2424
public function __construct(
25-
protected MeasurementError $measurementError = new MeasurementError(),
26-
protected Arr $arr = new Arr()
25+
protected MeasurementError $measurementError = new MeasurementError,
26+
protected Arr $arr = new Arr
2727
) {}
2828

2929
public function transform(array $data): array
@@ -70,7 +70,7 @@ protected function avg(array $values): array
7070

7171
return [
7272
'time' => array_sum($this->arr->pluck($values, 'time')) / count($values),
73-
'ram' => array_sum($this->arr->pluck($values, 'ram')) / count($values),
73+
'ram' => array_sum($this->arr->pluck($values, 'ram')) / count($values),
7474
];
7575
}
7676

src/Transformers/Transformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ public function merge(array ...$arrays): array
5353

5454
protected function resolve(string|TransformerContract $transformer, array $data): array
5555
{
56-
return (new $transformer())->transform($data);
56+
return (new $transformer)->transform($data);
5757
}
5858
}

src/Transformers/Winner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Winner extends Base
2121
];
2222

2323
public function __construct(
24-
protected Arr $arr = new Arr()
24+
protected Arr $arr = new Arr
2525
) {}
2626

2727
public function transform(array $data): array

0 commit comments

Comments
 (0)