Skip to content

Commit 714ba36

Browse files
committed
[TASK] Avoid some useless test assertions
PSR-7 MessageInterface forces getHeader(): array, there is no point in asserting this in tests. Avoiding this makes phpstan more happy. Resolves: #105684 Releases: main, 13.4 Change-Id: Ib85188734f2240c88489c1480297b1e3eba38bc1 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/87192 Reviewed-by: Simon Praetorius <simon@praetorius.me> Tested-by: core-ci <typo3@b13.com> Tested-by: Andreas Nedbal <andy@pixelde.su> Reviewed-by: Andreas Nedbal <andy@pixelde.su> Tested-by: Simon Praetorius <simon@praetorius.me> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
1 parent 4001ec9 commit 714ba36

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

Build/phpstan/phpstan-baseline.neon

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4842,12 +4842,6 @@ parameters:
48424842
count: 1
48434843
path: ../../typo3/sysext/redirects/Tests/Functional/EventListener/AddPageTypeZeroSourceTest.php
48444844

4845-
-
4846-
message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertIsArray\(\) with array\<string\> will always evaluate to true\.$#'
4847-
identifier: staticMethod.alreadyNarrowedType
4848-
count: 16
4849-
path: ../../typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
4850-
48514845
-
48524846
message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#'
48534847
identifier: function.alreadyNarrowedType

typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ public function checkReponseCodeOnRedirect($url, $statusCode, $targetUrl, $redir
176176
new InternalRequest($url)
177177
);
178178
self::assertEquals($statusCode, $response->getStatusCode());
179-
self::assertIsArray($response->getHeader('X-Redirect-By'));
180-
self::assertIsArray($response->getHeader('location'));
181179
self::assertEquals('TYPO3 Redirect ' . $redirectUid, $response->getHeader('X-Redirect-By')[0]);
182180
self::assertEquals($targetUrl, $response->getHeader('location')[0]);
183181
}
@@ -325,8 +323,6 @@ public function checkRegExpRedirects(string $url, int $expectedStatusCode, strin
325323
false
326324
);
327325
self::assertEquals($expectedStatusCode, $response->getStatusCode());
328-
self::assertIsArray($response->getHeader('X-Redirect-By'));
329-
self::assertIsArray($response->getHeader('location'));
330326
self::assertEquals('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
331327
self::assertEquals($expectedRedirectUri, $response->getHeader('location')[0]);
332328
}
@@ -383,8 +379,6 @@ public function regexpWithNoParamRegexpAndRespectingGetParameteresRedirectsIfNoP
383379
false
384380
);
385381
self::assertSame($expectedStatusCode, $response->getStatusCode());
386-
self::assertIsArray($response->getHeader('X-Redirect-By'));
387-
self::assertIsArray($response->getHeader('location'));
388382
self::assertSame('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
389383
self::assertSame($expectedRedirectUri, $response->getHeader('location')[0]);
390384
}
@@ -540,8 +534,6 @@ public function samePathWithSameDomainT3Target(string $url, string $baseUri, int
540534
);
541535
self::assertEquals($expectedStatusCode, $response->getStatusCode());
542536
if ($expectedRedirectUri) {
543-
self::assertIsArray($response->getHeader('X-Redirect-By'));
544-
self::assertIsArray($response->getHeader('location'));
545537
self::assertEquals('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
546538
self::assertEquals($expectedRedirectUri, $response->getHeader('location')[0]);
547539
}
@@ -683,8 +675,6 @@ public function samePathWithSameDomainAndRelativeTarget(string $url, string $bas
683675
);
684676
self::assertEquals($expectedStatusCode, $response->getStatusCode());
685677
if ($expectedRedirectUri) {
686-
self::assertIsArray($response->getHeader('X-Redirect-By'));
687-
self::assertIsArray($response->getHeader('location'));
688678
self::assertEquals('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
689679
self::assertEquals($expectedRedirectUri, $response->getHeader('location')[0]);
690680
}
@@ -846,8 +836,6 @@ public function samePathRedirectsWithExternalTarget(string $url, string $baseUri
846836
);
847837
self::assertEquals($expectedStatusCode, $response->getStatusCode());
848838
if ($expectedRedirectUri) {
849-
self::assertIsArray($response->getHeader('X-Redirect-By'));
850-
self::assertIsArray($response->getHeader('location'));
851839
self::assertEquals('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
852840
self::assertEquals($expectedRedirectUri, $response->getHeader('location')[0]);
853841
}
@@ -964,8 +952,6 @@ public function regExpRedirectsWithArgumentMatchesWithSimilarRegExpWithoutQueryP
964952
new InternalRequest($url)
965953
);
966954
self::assertEquals($statusCode, $response->getStatusCode());
967-
self::assertIsArray($response->getHeader('X-Redirect-By'));
968-
self::assertIsArray($response->getHeader('location'));
969955
self::assertEquals('TYPO3 Redirect ' . $redirectUid, $response->getHeader('X-Redirect-By')[0]);
970956
self::assertEquals($targetUrl, $response->getHeader('location')[0]);
971957
}
@@ -1076,8 +1062,6 @@ public function sourceHostNotNotContainedInAnySiteConfigRedirectIsRedirected(
10761062

10771063
$response = $this->executeFrontendSubRequest($request);
10781064
self::assertEquals($expectedRedirectStatusCode, $response->getStatusCode());
1079-
self::assertIsArray($response->getHeader('X-Redirect-By'));
1080-
self::assertIsArray($response->getHeader('location'));
10811065
self::assertEquals('TYPO3 Redirect ' . $expectedRedirectUid, $response->getHeader('X-Redirect-By')[0]);
10821066
self::assertEquals($expectedRedirectLocationUri, $response->getHeader('location')[0]);
10831067
}

0 commit comments

Comments
 (0)