Skip to content

Commit 7851501

Browse files
authored
Rename "number of batches" to "total number of batches" (#131)
1 parent 6b1b597 commit 7851501

10 files changed

+20
-20
lines changed

src/Configuration.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class Configuration
3232
/**
3333
* @var positive-int
3434
*/
35-
private int $numberOfBatches;
35+
private int $totalNumberOfBatches;
3636

3737
/**
3838
* @param positive-int $numberOfProcesses
@@ -63,7 +63,7 @@ public function __construct(
6363
? $numberOfItems
6464
: $segmentSize;
6565
$this->numberOfSegments = (int) (1 === $numberOfProcesses ? 1 : ceil($numberOfItems / $segmentSize));
66-
$this->numberOfBatches = (int) (ceil($segmentSize / $batchSize) * $this->numberOfSegments);
66+
$this->totalNumberOfBatches = (int) (ceil($segmentSize / $batchSize) * $this->numberOfSegments);
6767
}
6868

6969
/**
@@ -85,8 +85,8 @@ public function getNumberOfSegments(): int
8585
/**
8686
* @return positive-int
8787
*/
88-
public function getNumberOfBatches(): int
88+
public function getTotalNumberOfBatches(): int
8989
{
90-
return $this->numberOfBatches;
90+
return $this->totalNumberOfBatches;
9191
}
9292
}

src/Logger/Logger.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function logConfiguration(
2222
int $batchSize,
2323
int $numberOfItems,
2424
int $numberOfSegments,
25-
int $numberOfBatches,
25+
int $totalNumberOfBatches,
2626
int $numberOfProcesses,
2727
string $itemName
2828
): void;

src/Logger/NullLogger.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function logConfiguration(
2222
int $batchSize,
2323
int $numberOfItems,
2424
int $numberOfSegments,
25-
int $numberOfBatches,
25+
int $totalNumberOfBatches,
2626
int $numberOfProcesses,
2727
string $itemName
2828
): void {

src/Logger/StandardLogger.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function logConfiguration(
4848
int $batchSize,
4949
int $numberOfItems,
5050
int $numberOfSegments,
51-
int $numberOfBatches,
51+
int $totalNumberOfBatches,
5252
int $numberOfProcesses,
5353
string $itemName
5454
): void {
@@ -60,8 +60,8 @@ public function logConfiguration(
6060
$batchSize,
6161
$numberOfSegments,
6262
1 === $numberOfSegments ? 'round' : 'rounds',
63-
$numberOfBatches,
64-
1 === $numberOfBatches ? 'batch' : 'batches',
63+
$totalNumberOfBatches,
64+
1 === $totalNumberOfBatches ? 'batch' : 'batches',
6565
$numberOfProcesses,
6666
1 === $numberOfProcesses ? 'process' : 'processes',
6767
));

src/ParallelExecutor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,15 +228,15 @@ private function executeMainProcess(
228228
);
229229

230230
$numberOfSegments = $config->getNumberOfSegments();
231-
$numberOfBatches = $config->getNumberOfBatches();
231+
$totalNumberOfBatches = $config->getTotalNumberOfBatches();
232232
$itemName = ($this->getItemName)($numberOfItems);
233233

234234
$logger->logConfiguration(
235235
$segmentSize,
236236
$batchSize,
237237
$numberOfItems,
238238
$numberOfSegments,
239-
$numberOfBatches,
239+
$totalNumberOfBatches,
240240
$numberOfProcesses,
241241
$itemName,
242242
);

tests/ConfigurationTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function test_it_can_be_instantiated(
4747

4848
self::assertSame($expectedSegmentSize, $config->getSegmentSize());
4949
self::assertSame($expectedNumberOfSegments, $config->getNumberOfSegments());
50-
self::assertSame($expectedNumberOfBatches, $config->getNumberOfBatches());
50+
self::assertSame($expectedNumberOfBatches, $config->getTotalNumberOfBatches());
5151
}
5252

5353
/**

tests/Logger/DummyLogger.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function logConfiguration(
2525
int $batchSize,
2626
int $numberOfItems,
2727
int $numberOfSegments,
28-
int $numberOfBatches,
28+
int $totalNumberOfBatches,
2929
int $numberOfProcesses,
3030
string $itemName
3131
): void {

tests/Logger/FakeLogger.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function logConfiguration(
2323
int $batchSize,
2424
int $numberOfItems,
2525
int $numberOfSegments,
26-
int $numberOfBatches,
26+
int $totalNumberOfBatches,
2727
int $numberOfProcesses,
2828
string $itemName
2929
): void {

tests/Logger/StandardLoggerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function test_it_can_log_the_configuration(
5353
int $batchSize,
5454
int $numberOfItems,
5555
int $numberOfSegments,
56-
int $numberOfBatches,
56+
int $totalNumberOfBatches,
5757
int $numberOfProcesses,
5858
string $itemName,
5959
string $expected
@@ -63,7 +63,7 @@ public function test_it_can_log_the_configuration(
6363
$batchSize,
6464
$numberOfItems,
6565
$numberOfSegments,
66-
$numberOfBatches,
66+
$totalNumberOfBatches,
6767
$numberOfProcesses,
6868
$itemName,
6969
);

tests/ParallelExecutorTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ private static function mainProcessWithChildProcessLaunchedProvider(): iterable
868868
$numberOfProcesses = 5;
869869
$numberOfProcessesDefined = true;
870870
$numberOfSegments = 2;
871-
$numberOfBatches = 2;
871+
$totalNumberOfBatches = 2;
872872

873873
$input = new StringInput('');
874874
$output = new BufferedOutput();
@@ -912,7 +912,7 @@ private static function mainProcessWithChildProcessLaunchedProvider(): iterable
912912
$batchSize,
913913
3,
914914
$numberOfSegments,
915-
$numberOfBatches,
915+
$totalNumberOfBatches,
916916
$numberOfProcesses,
917917
'items',
918918
],
@@ -937,7 +937,7 @@ private static function mainProcessWithoutChildProcessLaunchedProvider(): iterab
937937
$segmentSize = 3;
938938
$numberOfProcesses = 1;
939939
$numberOfSegments = 1;
940-
$numberOfBatches = 2;
940+
$totalNumberOfBatches = 2;
941941

942942
$input = new StringInput('');
943943
$output = new BufferedOutput();
@@ -1003,7 +1003,7 @@ private static function mainProcessWithoutChildProcessLaunchedProvider(): iterab
10031003
$batchSize,
10041004
3,
10051005
$numberOfSegments,
1006-
$numberOfBatches,
1006+
$totalNumberOfBatches,
10071007
$numberOfProcesses,
10081008
'items',
10091009
],

0 commit comments

Comments
 (0)