8000 Always display timing after run, except when in quiet mode · PHPCSStandards/PHP_CodeSniffer@7a24e38 · GitHub
Skip to content

Commit 7a24e38

Browse files
gsherwoodjrfnl
gsherwood
and
jrfnl
committed
Always display timing after run, except when in quiet mode
What with the Timing output now going to `STDERR`, we no longer need to be concerned about the Timing output ending up in `json`, `csv` or `xml` reports (to name a few). In effect, this means, we can now always display Timing and memory usage info at the end of the run. I'm making one exception though: timing will not be displayed when running in `quiet` mode. Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
1 parent 8016696 commit 7a24e38

File tree

8 files changed

+7
-48
lines changed

8 files changed

+7
-48
lines changed

‎src/Reports/Cbf.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
use PHP_CodeSniffer\Exceptions\DeepExitException;
1717
use PHP_CodeSniffer\Files\File;
18-
use PHP_CodeSniffer\Util\Timing;
1918
use PHP_CodeSniffer\Util\Writers\StatusWriter;
2019

2120
class Cbf implements Report
@@ -254,10 +253,6 @@ public function generate(
254253

255254
echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
256255

257-
if ($toScreen === true && $interactive === false) {
258-
Timing::printRunTime();
259-
}
260-
261256
}//end generate()
262257

263258

‎src/Reports/Code.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Exception;
1313
use PHP_CodeSniffer\Files\File;
1414
use PHP_CodeSniffer\Util\Common;
15-
use PHP_CodeSniffer\Util\Timing;
1615
use PHP_CodeSniffer\Util\Writers\StatusWriter;
1716

1817
class Code implements Report
@@ -358,10 +357,6 @@ public function generate(
358357

359358
echo $cachedData;
360359

361-
if ($toScreen === true && $interactive === false) {
362-
Timing::printRunTime();
363-
}
364-
365360
}//end generate()
366361

367362

‎src/Reports/Full.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace PHP_CodeSniffer\Reports;
1111

1212
use PHP_CodeSniffer\Files\File;
13-
use PHP_CodeSniffer\Util\Timing;
1413

1514
class Full implements Report
1615
{
@@ -250,10 +249,6 @@ public function generate(
250249

251250
echo $cachedData;
252251

253-
if ($toScreen === true && $interactive === false) {
254-
Timing::printRunTime();
255-
}
256-
257252
}//end generate()
258253

259254

‎src/Reports/Info.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace PHP_CodeSniffer\Reports;
1111

1212
use PHP_CodeSniffer\Files\File;
13-
use PHP_CodeSniffer\Util\Timing;
1413

1514
class Info implements Report
1615
{
@@ -163,10 +162,6 @@ public function generate(
163162

164163
echo str_repeat('-', 70).PHP_EOL;
165164

166-
if ($toScreen === true && $interactive === false) {
167-
Timing::printRunTime();
168-
}
169-
170165
}//end generate()
171166

172167

‎src/Reports/Source.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace PHP_CodeSniffer\Reports;
1111

1212
use PHP_CodeSniffer\Files\File;
13-
use PHP_CodeSniffer\Util\Timing;
1413

1514
class Source implements Report
1615
{
@@ -266,10 +265,6 @@ public function generate(
266265

267266
echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
268267

269-
if ($toScreen === true && $interactive === false) {
270-
Timing::printRunTime();
271-
}
272-
273268
}//end generate()
274269

275270

‎src/Reports/Summary.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
namespace PHP_CodeSniffer\Reports;
1111

1212
use PHP_CodeSniffer\Files\File;
13-
use PHP_CodeSniffer\Util\Timing;
1413

1514
class Summary implements Report
1615
{
@@ -174,10 +173,6 @@ function ($keyA, $keyB) {
174173

175174
echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
176175

177-
if ($toScreen === true && $interactive === false) {
178-
Timing::printRunTime();
179-
}
180-
181176
}//end generate()
182177

183178

‎src/Reports/VersionControl.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
namespace PHP_CodeSniffer\Reports;
1212

1313
use PHP_CodeSniffer\Files\File;
14-
use PHP_CodeSniffer\Util\Timing;
1514

1615
abstract class VersionControl implements Report
1716
{
@@ -347,10 +346,6 @@ public function generate(
347346

348347
echo PHP_EOL.str_repeat('-', $width).PHP_EOL.PHP_EOL;
349348

350-
if ($toScreen === true && $interactive === false) {
351-
Timing::printRunTime();
352-
}
353-
354349
}//end generate()
355350

356351

‎src/Runner.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,9 @@ public function runPHPCS()
120120
$numErrors = $this->run();
121121

122122
// Print all the reports for this run.
123-
$toScreen = $this->reporter->printReports();
124-
125-
// Only print timer output if no reports were
126-
// printed to the screen so we don't put additional output
127-
// in something like an XML report. If we are printing to screen,
128-
// the report types would have already worked out who should
129-
// print the timer info.
130-
if ($this->config->interactive === false
131-
&& ($toScreen === false
132-
|| (($this->reporter->totalErrors + $this->reporter->totalWarnings) === 0 && $this->config->showProgress === true))
133-
) {
123+
$this->reporter->printReports();
124+
125+
if ($this->config->quiet === false) {
134126
Timing::printRunTime();
135127
}
136128
} catch (DeepExitException $e) {
@@ -215,8 +207,10 @@ public function runPHPCBF()
215207
$this->run();
216208
$this->reporter->printReports();
217209

218-
echo PHP_EOL;
219-
Timing::printRunTime();
210+
if ($this->config->quiet === false) {
211+
StatusWriter::write('');
212+
Timing::printRunTime();
213+
}
220214
} catch (DeepExitException $e) {
221215
echo $e->getMessage();
222216
return $e->getCode();

0 commit comments

Comments
 (0)