Skip to content

Commit 9f3b983

Browse files
style: resolve lint issues.
Signed-off-by: Khushal Patel <khushal.b.patel01@gmail.com>
1 parent c18a450 commit 9f3b983

2 files changed

Lines changed: 14 additions & 13 deletions

File tree

libraries/classes/Display/Results.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
use function intval;
5252
use function is_array;
5353
use function is_numeric;
54-
use function is_string;
5554
use function json_encode;
5655
use function max;
5756
use function mb_check_encoding;
@@ -4419,8 +4418,8 @@ private function getRowData(
44194418
array $analyzedSqlResults,
44204419
FieldMetadata $meta,
44214420
array $map,
4422-
$data,
4423-
$displayedData,
4421+
string $data,
4422+
string $displayedData,
44244423
?TransformationsPlugin $transformationPlugin,
44254424
string $nowrap,
44264425
string $whereComparison,
@@ -4441,10 +4440,7 @@ private function getRowData(
44414440
$transformationPlugin !== null
44424441
);
44434442

4444-
$canonicalValue = null;
4445-
if (is_string($data)) {
4446-
$canonicalValue = str_replace(["\r\n", "\r"], "\n", $data);
4447-
}
4443+
$canonicalValue = str_replace(["\r\n", "\r"], "\n", $data);
44484444

44494445
if (! empty($analyzedSqlResults['statement']->expr)) {
44504446
foreach ($analyzedSqlResults['statement']->expr as $expr) {
@@ -4561,7 +4557,7 @@ private function getRowData(
45614557
*
45624558
* @param string $value The string whose line endings should be detected
45634559
*
4564-
* @return string|null Returns 'CRLF', 'LF', or null if no line breaks exist
4560+
* @psalm-return 'CRLF'|'LF'|null
45654561
*/
45664562
private function detectLineEnding(string $value): ?string
45674563
{
@@ -4585,8 +4581,7 @@ private function detectLineEnding(string $value): ?string
45854581
*
45864582
* @param string $str string to be truncated
45874583
*
4588-
* @return array
4589-
* @psalm-return array{bool, string, int}
4584+
* @psalm-return array{bool, string, int, 'CRLF'|'LF'|null}
45904585
*/
45914586
private function getPartialText($str): array
45924587
{

test/classes/Display/ResultsTest.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,21 +1595,27 @@ public function testGetTable(): void
15951595
. '<td data-decimals="0" data-type="string" data-originallength="4" class="'
15961596
. 'data not_null text pre_wrap" data-original-value="abcd">abcd</td>' . "\n"
15971597
. '<td data-decimals="0" data-type="datetime" data-originallength="19" class="'
1598-
. 'data not_null datetimefield text-nowrap" data-original-value="2011-01-20&#x20;02&#x3A;00&#x3A;02">2011-01-20 02:00:02</td>' . "\n"
1598+
. 'data not_null datetimefield text-nowrap" '
1599+
. 'data-original-value="2011-01-20&#x20;02&#x3A;00&#x3A;02">2011-01-20 02:00:02</td>'
1600+
. "\n"
15991601
. '</tr>' . "\n"
16001602
. '<tr><td data-decimals="0" data-type="real" class="'
16011603
. 'text-end data not_null text-nowrap" data-original-value="2">2</td>' . "\n"
16021604
. '<td data-decimals="0" data-type="string" data-originallength="3" class="'
16031605
. 'data not_null text pre_wrap" data-original-value="foo">foo</td>' . "\n"
16041606
. '<td data-decimals="0" data-type="datetime" data-originallength="19" class="'
1605-
. 'data not_null datetimefield text-nowrap" data-original-value="2010-01-20&#x20;02&#x3A;00&#x3A;02">2010-01-20 02:00:02</td>' . "\n"
1607+
. 'data not_null datetimefield text-nowrap" '
1608+
. 'data-original-value="2010-01-20&#x20;02&#x3A;00&#x3A;02">2010-01-20 02:00:02</td>'
1609+
. "\n"
16061610
. '</tr>' . "\n"
16071611
. '<tr><td data-decimals="0" data-type="real" class="'
16081612
. 'text-end data not_null text-nowrap" data-original-value="3">3</td>' . "\n"
16091613
. '<td data-decimals="0" data-type="string" data-originallength="4" class="'
16101614
. 'data not_null text pre_wrap" data-original-value="Abcd">Abcd</td>' . "\n"
16111615
. '<td data-decimals="0" data-type="datetime" data-originallength="19" class="'
1612-
. 'data not_null datetimefield text-nowrap" data-original-value="2012-01-20&#x20;02&#x3A;00&#x3A;02">2012-01-20 02:00:02</td>' . "\n"
1616+
. 'data not_null datetimefield text-nowrap" '
1617+
. 'data-original-value="2012-01-20&#x20;02&#x3A;00&#x3A;02">2012-01-20 02:00:02</td>'
1618+
. "\n"
16131619
. '</tr>' . "\n",
16141620
'bulk_links' => [],
16151621
'operations' => [

0 commit comments

Comments
 (0)