Skip to content

Commit a80a521

Browse files
dantleechdantleech
committed
CS fixes
1 parent a5fd0a4 commit a80a521

File tree

15 files changed

+29
-43
lines changed

15 files changed

+29
-43
lines changed

‎lib/Core/Pipeline.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use PhpBench\Pipeline\Core\Exception\InvalidStage;
77
use PhpBench\Pipeline\Core\Exception\InvalidArgumentException;
88
use PhpBench\Pipeline\Core\Exception\InvalidYieldedValue;
9-
use PhpBench\Pipeline\Core\ConfiguredGenerator;
109

1110
class Pipeline implements Stage, PipelineExtension
1211
{
@@ -155,7 +154,7 @@ private function replaceTokens(array $generatorConfig, $data): array
155154
));
156155
}
157156

158-
$replacements['%' . $key . '%'] = $data[$key];
157+
$replacements['%'.$key.'%'] = $data[$key];
159158
}
160159

161160
$value = strtr($value, $replacements);

‎lib/Extension/Console/ConsoleExtension.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@
44

55
use PhpBench\Pipeline\Core\PipelineExtension;
66
use PhpBench\Pipeline\Core\Stage;
7-
use PhpBench\Pipeline\Extension\Core\Stage\Encoder\JsonEncoder;
8-
use PhpBench\Pipeline\Extension\Core\Stage\Sampler\CallableSampler;
9-
use PhpBench\Pipeline\Extension\Core\Stage\Output\StreamOutput;
10-
use PhpBench\Pipeline\Extension\Core\Stage\Parameter\SerialParameter;
11-
use PhpBench\Pipeline\Extension\Core\Stage\Valve\TakeValve;
12-
use PhpBench\Pipeline\Extension\Core\Stage\Sampler\CurlSampler;
13-
use PhpBench\Pipeline\Extension\Core\Stage\Filter\KeysFilter;
14-
use PhpBench\Pipeline\Extension\Core\Stage\Aggregator\DescribeAggregator;
15-
use PhpBench\Pipeline\Extension\Core\Stage\Parameter\CounterParameter;
16-
use PhpBench\Pipeline\Extension\Core\Stage\Valve\DelayValve;
177
use PhpBench\Pipeline\Extension\Console\Stage\Redraw;
188

199
class ConsoleExtension implements PipelineExtension

‎lib/Extension/Console/Stage/Redraw.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public function __invoke(): Generator
2222
while (true) {
2323
foreach ($data as &$line) {
2424
if (null === $lastData) {
25-
$line = self::ANSI_SAVE_CURSOR_POS . $line;
25+
$line = self::ANSI_SAVE_CURSOR_POS.$line;
2626
}
2727

2828
if ($lastData) {
29-
$line = self::ANSI_RESTORE_CURSOR_POS . $line;
29+
$line = self::ANSI_RESTORE_CURSOR_POS.$line;
3030
$lineLength = $this->maxLineLength($line, $lineLength);
3131
$line = $this->maximizeLines($line, $lineLength);
3232
}

‎lib/Extension/Console/Util/ConsoleUtil.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class ConsoleUtil
77
public static function pad(string $string, int $length)
88
{
99
$width = $length - mb_strlen($string);
10-
return $string . str_repeat(' ', $width);
10+
11+
return $string.str_repeat(' ', $width);
1112
}
1213
}

‎lib/Extension/Core/Stage/Parameter/CounterParameter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public function __invoke(): Generator
1414

1515
$count = 0;
1616
while (true) {
17-
list($config, $data) = yield [ $config['name'] => $count += $config['step'] ];
17+
list($config, $data) = yield [$config['name'] => $count += $config['step']];
1818
}
1919
}
2020

2121
public function configure(Schema $schema)
2222
{
2323
$schema->setDefaults([
2424
'name' => 'count',
25-
'step' => 1
25+
'step' => 1,
2626
]);
2727
}
2828
}

‎lib/Extension/Core/Stage/Sampler/CurlSampler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ public function __invoke(): Generator
2121
while (true) {
2222
if ($this->activeRequests < $config['concurrency']) {
2323
$this->sampleUrl($config);
24-
$this->activeRequests++;
24+
++$this->activeRequests;
2525
}
2626

2727
$multiInfo = curl_multi_info_read($this->multiHandle);
2828
curl_multi_exec($this->multiHandle, $active);
2929

3030
if (false !== $multiInfo) {
3131
$info = $this->closeHandle($multiInfo);
32-
$this->activeRequests--;
32+
--$this->activeRequests;
3333
list($config, $data) = yield $info;
3434
}
3535

‎lib/Extension/Core/Stage/Valve/DelayValve.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __invoke(): Generator
2121
public function configure(Schema $schema)
2222
{
2323
$schema->setDefaults([
24-
'time' => 10000
24+
'time' => 10000,
2525
]);
2626
}
2727
}

‎tests/Unit/Core/PipelineTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function testSubstitutesConfig($configValue, array $data, array $expected
9292
])->will(function () use ($configValue) {
9393
return new ConfiguredGenerator((function () {
9494
list($config, $data) = yield;
95-
yield [ $config['key'] ];
95+
yield [$config['key']];
9696

9797
})(), [
9898
'key' => $configValue,
@@ -110,42 +110,42 @@ public function provideSubstitutesConfigTokensWithDataValues()
110110
{
111111
yield 'token only' => [
112112
'%my_value%',
113-
[ 'my_value' => 'Hai!' ],
114-
['Hai!']
113+
['my_value' => 'Hai!'],
114+
['Hai!'],
115115
];
116116

117117
yield 'token with surrounding text' => [
118118
'hello - %my_value% - bye',
119-
[ 'my_value' => 'Hai!' ],
120-
['hello - Hai! - bye']
119+
['my_value' => 'Hai!'],
120+
['hello - Hai! - bye'],
121121
];
122122

123123
yield 'multiple same tokens' => [
124124
'%my_value% - %my_value%',
125-
[ 'my_value' => 'Hai!' ],
126-
['Hai! - Hai!']
125+
['my_value' => 'Hai!'],
126+
['Hai! - Hai!'],
127127
];
128128

129129
yield 'multiple different tokens' => [
130130
'%my_value% - %my.foobar%',
131-
[ 'my_value' => 'Hai!', 'my.foobar' => 'Ciao!' ],
132-
['Hai! - Ciao!']
131+
['my_value' => 'Hai!', 'my.foobar' => 'Ciao!'],
132+
['Hai! - Ciao!'],
133133
];
134134

135135
yield 'token only' => [
136136
'%my_value%',
137-
[ 'my_value' => 'Hai!' ],
138-
['Hai!']
137+
['my_value' => 'Hai!'],
138+
['Hai!'],
139139
];
140140

141141
yield 'throws exception if data does not contain the token' => [
142142
'%my_value% - %my.foobar%',
143-
[ 'my_value' => 'Hai!' ],
143+
['my_value' => 'Hai!'],
144144
[],
145145
[
146146
InvalidArgumentException::class,
147-
'Data does not contain key for token "my.foobar", data keys: "my_value"'
148-
]
147+
'Data does not contain key for token "my.foobar", data keys: "my_value"',
148+
],
149149
];
150150
}
151151

‎tests/Unit/Extension/Console/ConsoleTestCase.php

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

55
use PHPUnit\Framework\TestCase;
66
use PhpBench\Pipeline\Core\PipelineBuilder;
7-
use PhpBench\Pipeline\Extension\Core\CoreExtension;
87
use PhpBench\Pipeline\Extension\Console\ConsoleExtension;
98

109
class ConsoleTestCase extends TestCase

‎tests/Unit/Extension/Console/Stage/RedrawTest.php

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

33
namespace PhpBench\Pipeline\Tests\Unit\Extension\Console\Stage;
44

5-
use PHPUnit\Framework\TestCase;
65
use PhpBench\Pipeline\Tests\Unit\Extension\Console\ConsoleTestCase;
76

87
class RedrawTest extends ConsoleTestCase

‎tests/Unit/Extension/Core/CoreTestCase.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use PHPUnit\Framework\TestCase;
66
use PhpBench\Pipeline\Core\PipelineBuilder;
77
use PhpBench\Pipeline\Extension\Core\CoreExtension;
8-
use PhpBench\Pipeline\Extension\Console\ConsoleExtension;
98

109
class CoreTestCase extends TestCase
1110
{

‎tests/Unit/Extension/Core/Stage/Sampler/CurlSamplerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ public function testSendsHeaders()
8383
public function testConcurrentRequests()
8484
{
8585
$result = $this->pipeline()
86-
->stage('valve/take', [ 'quantity' => 4 ])
86+
->stage('valve/take', ['quantity' => 4])
8787
->stage('sampler/curl', [
8888
'url' => self::SAMPLE_URL,
8989
'concurrency' => 4,
9090
'async' => true,
9191
])
92-
->stage('aggregator/describe', [ 'group_by' => 'url', 'describe' => 'total_time' ])
92+
->stage('aggregator/describe', ['group_by' => 'url', 'describe' => 'total_time'])
9393
->stage('parameter/counter')
9494
->run();
9595

‎tests/Unit/Extension/Core/Stage/Valve/DelayValveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public function testDelaysExecution()
1010
{
1111
$start = microtime(true);
1212
$this->pipeline()
13-
->stage('valve/delay', [ 'time' => 10000 ])
13+
->stage('valve/delay', ['time' => 10000])
1414
->generator()
1515
->current();
1616

‎tests/Unit/Extension/Core/Stage/Valve/TakeValveTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function testTakesOne()
1818
public function testTakeeThree()
1919
{
2020
$result = $this->pipeline()
21-
->stage(function () {
21+
->stage(function () {
2222
list($config, $data) = yield;
2323
while (true) {
2424
$data[] = 'goodbye';

‎tests/Unit/Extension/Core/Stage/Valve/TimeoutValveTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace PhpBench\Pipeline\Tests\Unit\Extension\Core\Stage\Valve;
44

5-
use PHPUnit\Framework\TestCase;
65
use PhpBench\Pipeline\Tests\Unit\Extension\Core\CoreTestCase;
76

87
class TimeoutValveTest extends CoreTestCase
@@ -11,7 +10,7 @@ public function testTerminatesAfterAGivenNumberOfMicroseconds()
1110
{
1211
$start = microtime(true);
1312
$this->pipeline()
14-
->stage('valve/timeout', [ 'time' => 100000 ])
13+
->stage('valve/timeout', ['time' => 100000])
1514
->run();
1615

1716
$time = (microtime(true) - $start) * 1E6;

0 commit comments

Comments
 (0)