Skip to content

Commit e80aed9

Browse files
noximonoximo
committed
phpstan errors
1 parent 0e2d4d4 commit e80aed9

22 files changed

+603
-288
lines changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
"symplify/easy-coding-standard": "^6.0"
3939
},
4040
"scripts": {
41-
"check-cs": "ecs check src",
42-
"fix-cs": "ecs check src --fix",
41+
"check-cs": "ecs check src examples",
42+
"fix-cs": "ecs check src examples --fix",
4343
"lint": "parallel-lint --colors --exclude vendor .",
44-
"phpstan": "phpstan analyze src --level max -c phpstan.neon --error-format=fileoutput",
44+
"phpstan": "phpstan analyze src examples --level max -c phpstan.neon --error-format=fileoutput",
4545
"test": [
4646
"@lint",
4747
"@check-cs",

‎ecs.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ parameters:
1616
SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff: ~
1717
Symplify\CodingStandard\Sniffs\DependencyInjection\NoClassInstantiationSniff: ~
1818
Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenStaticFunctionSniff: ~
19-
SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff.MissingTraversableReturnTypeHintSpecification: ~ #DELETE
19+
PhpCsFixer\Fixer\Import\OrderedImportsFixer: ~
20+
Symplify\CodingStandard\Fixer\Commenting\BlockPropertyCommentFixer: ~
21+
Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff: ~

‎examples/badInput.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
3+
declare(strict_types=1);
4+
55
use noximo\PHPColoredAsciiLinechart\Linechart;
6+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
67

78
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
89
$lineGraph = new Linechart();
@@ -16,8 +17,8 @@
1617
14 => 8,
1718
8 => 2,
1819
3 => 2,
19-
4 => 2
20+
4 => 2,
2021
];
2122
$lineGraph->addMarkers($lineA, [AsciiColorizer::GREEN, AsciiColorizer::BOLD], [AsciiColorizer::RED]);
2223

23-
echo $lineGraph->chart();
24+
$lineGraph->chart()->print();

‎examples/example.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910

@@ -18,7 +19,7 @@
1819
->setFormat( //control how y axis labels will be printed out
1920
function ($x, Settings $settings) {
2021
$padding = $settings->getPadding();
21-
$paddingLength = \strlen($padding);
22+
$paddingLength = strlen($padding);
2223

2324
return substr($padding . round($x, 2), -$paddingLength);
2425
}
@@ -57,7 +58,6 @@ function ($x, Settings $settings) {
5758
Linechart::CROSS //Point can be made more visible with crosslines. Default is Linegraph::POINT
5859
);
5960

60-
6161
$graph = $lineGraph->chart(); //Graph is an object with all data drawn. It can be simply echoed or we can leverage its methods for output control
6262

6363
$graph->clearScreen(); //clears already outputed graphs

‎examples/floats.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$settings = new Settings();
@@ -15,7 +16,7 @@
1516
try {
1617
$line = [];
1718
for ($i = 0; $i < 120; $i++) {
18-
$line[$i] = ($lineA[$i - 1] ?? 1) + (lcg_value() * random_int(-1, 1));
19+
$line[$i] = $lineA[$i - 1] ?? 1 + (lcg_value() * random_int(-1, 1));
1920
}
2021
for ($y = 0; $y < 1500; $y++) {
2122
array_shift($line);
@@ -27,6 +28,6 @@
2728
$lineGraph->chart()->clearScreen()->print()->wait();
2829
$lineGraph->clearAllMarkers();
2930
}
30-
} catch (Exception $e) {
31+
} catch (\Throwable $e) {
3132
echo $e->getMessage();
3233
}

‎examples/html.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\HTMLColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\HTMLColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$lineGraph = new Linechart();
@@ -19,5 +20,4 @@
1920
$lineGraph->addMarkers($lineA, ['color: green'], ['color: red']);
2021
$lineGraph->setSettings($settings);
2122

22-
23-
echo $lineGraph->chart();
23+
$lineGraph->chart()->print();

‎examples/image.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
2-
declare(strict_types = 1);
32

3+
declare(strict_types=1);
4+
5+
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
47
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
58
use noximo\PHPColoredAsciiLinechart\Colorizers\ImageColorizer;
6-
use noximo\PHPColoredAsciiLinechart\Linechart;
7-
use noximo\PHPColoredAsciiLinechart\Settings;
89

910
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
1011
$lineGraph = new Linechart();
@@ -26,11 +27,11 @@
2627
$font = __DIR__ . '/font/font.ttf';
2728
$fontSize = 40;
2829

29-
$text = $graph->outputChart();
30+
$text = (string) $graph;
3031

3132
// Calculate the required width to hold this text
3233
$enclosingBox = imagettfbbox($fontSize, 0, $font, $text);
33-
$width = ($enclosingBox[2] - $enclosingBox[0]) - 10;
34+
$width = $enclosingBox[2] - $enclosingBox[0] - 10;
3435

3536
$height = $fontSize * $graph->getSettings()->getHeight() * 2;
3637

‎examples/largeKeys.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
3+
declare(strict_types=1);
4+
55
use noximo\PHPColoredAsciiLinechart\Linechart;
6+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
67

78
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
89
$lineGraph = new Linechart();
@@ -25,4 +26,4 @@
2526
];
2627
$lineGraph->addMarkers($lineA, [AsciiColorizer::GREEN, AsciiColorizer::BOLD]);
2728

28-
echo $lineGraph->chart();
29+
$lineGraph->chart()->print();

‎examples/line.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
declare(strict_types=1);
44

5-
use noximo\PHPColoredAsciiLinechart\Linechart;
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
77

88
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
99
$settings = new Settings();
1010
$settings->setFPS(40);
11-
$settings->setHeight(null);
1211

1312
$lineGraph = new Linechart();
1413
$lineGraph->setSettings($settings);
1514

1615
try {
1716
$linechart = new Linechart();
1817
$linechart->addMarkers([1, 1, 1, 1, 1, 1])->chart()->print();
19-
} catch (Exception $e) {
18+
} catch (\Throwable $e) {
2019
echo $e->getMessage();
2120
}

‎examples/randomValues.php

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$settings = new Settings();
@@ -13,11 +14,15 @@
1314
$lineGraph->setSettings($settings);
1415

1516
try {
17+
$lineA = [];
18+
$lineB = [];
19+
$lineC = [];
20+
$lineD = [];
1621
for ($i = 0; $i < 120; $i++) {
17-
$lineA[$i] = ($lineA[$i - 1] ?? 1) + random_int(-2, 2);
18-
$lineB[$i] = ($lineB[$i - 1] ?? 1) + random_int(-2, 2);
19-
$lineC[$i] = ($lineC[$i - 1] ?? 1) + random_int(-2, 2);
20-
$lineD[$i] = ($lineD[$i - 1] ?? 1) + random_int(-2, 2);
22+
$lineA[$i] = $lineA[$i - 1] ?? 1 + random_int(-2, 2);
23+
$lineB[$i] = $lineB[$i - 1] ?? 1 + random_int(-2, 2);
24+
$lineC[$i] = $lineC[$i - 1] ?? 1 + random_int(-2, 2);
25+
$lineD[$i] = $lineD[$i - 1] ?? 1 + random_int(-2, 2);
2126
}
2227
for ($y = 0; $y < 1500; $y++) {
2328
array_shift($lineA);
@@ -39,6 +44,6 @@
3944
$lineGraph->chart()->clearScreen()->print()->wait();
4045
$lineGraph->clearAllMarkers();
4146
}
42-
} catch (Exception $e) {
43-
echo $e->getMessage();
47+
} catch (Throwable $throwable) {
48+
echo $throwable->getMessage();
4449
}

‎examples/realData.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$settings = new Settings();
1011
$settings->setFPS(40);
11-
$settings->setHeight(null);
1212
$lineGraph = new Linechart();
1313
$lineGraph->setSettings($settings);
1414

1515
try {
16-
$line = [0.0208, 0.020858, 0.021, 0.021, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.021056, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.021124, 0.0214, 0.0215, 0.021436, 0.02149, 0.021488, 0.02149, 0.02145, 0.02145, 0.021406, 0.02145, 0.02145, 0.02145, 0.0214, 0.02145, 0.021487, 0.02149, 0.021482, 0.02148, 0.02148, 0.0215, 0.0215, 0.0215, 0.0215, 0.021499, 0.021473, 0.021454, 0.021497, 0.021489, 0.021454, 0.021705, 0.02151, 0.021513,];
16+
$line = [0.0208, 0.020858, 0.021, 0.021, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.021056, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.0211, 0.021124, 0.0214, 0.0215, 0.021436, 0.02149, 0.021488, 0.02149, 0.02145, 0.02145, 0.021406, 0.02145, 0.02145, 0.02145, 0.0214, 0.02145, 0.021487, 0.02149, 0.021482, 0.02148, 0.02148, 0.0215, 0.0215, 0.0215, 0.0215, 0.021499, 0.021473, 0.021454, 0.021497, 0.021489, 0.021454, 0.021705, 0.02151, 0.021513];
1717

1818
$lineGraph->addMarkers($line, [AsciiColorizer::GREEN], [AsciiColorizer::RED]);
1919

2020
$lineGraph->chart()->clearScreen()->print()->wait();
2121
$lineGraph->clearAllMarkers();
22-
} catch (Exception $e) {
22+
} catch (\Throwable $e) {
2323
echo $e->getMessage();
2424
}

‎examples/sinus.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$lineGraph = new Linechart();

‎examples/stretched.php

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
2-
declare(strict_types = 1);
32

4-
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
5-
use noximo\PHPColoredAsciiLinechart\Linechart;
3+
declare(strict_types=1);
4+
65
use noximo\PHPColoredAsciiLinechart\Settings;
6+
use noximo\PHPColoredAsciiLinechart\Linechart;
7+
use noximo\PHPColoredAsciiLinechart\Colorizers\AsciiColorizer;
78

89
require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
910
$settings = new Settings();
1011
$settings->setFPS(40);
11-
$settings->setHeight(null);
1212

1313
$lineGraph = new Linechart();
1414
$lineGraph->setSettings($settings);
@@ -23,7 +23,6 @@
2323

2424
$lineGraph->chart()->clearScreen()->print()->wait();
2525
$lineGraph->clearAllMarkers();
26-
27-
} catch (Exception $e) {
26+
} catch (\Throwable $e) {
2827
echo $e->getMessage();
2928
}

0 commit comments

Comments
 (0)