Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to use PHPUnit 10 syntax #201

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Update to use PHPUnit 10 syntax #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d0bdf
Update to use PHPUnit 10 syntax
samsonasik Nov 6, 2024
9c80959
use DataProvider from use statement
samsonasik Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 132 additions & 1 deletion psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.26.0@4787eaf414e16c661902b94dfe5d882223e5b513">
<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
<file src="src/AbstractSerializer.php">
<RedundantCondition>
<code><![CDATA[! $crFound]]></code>
Expand Down Expand Up @@ -317,11 +317,33 @@
<code><![CDATA[$ret]]></code>
<code><![CDATA[$ret]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[phpCallbacksForStreams]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/HeaderSecurityTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[assertNames]]></code>
<code><![CDATA[assertValues]]></code>
<code><![CDATA[getFilterValues]]></code>
<code><![CDATA[validateValues]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/MessageTraitTest.php">
<MixedArgument>
<code><![CDATA[$value]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[headersWithContinuation]]></code>
<code><![CDATA[headersWithInjectionVectors]]></code>
<code><![CDATA[headersWithWhitespace]]></code>
<code><![CDATA[invalidArrayHeaderValues]]></code>
<code><![CDATA[invalidGeneralHeaderValues]]></code>
<code><![CDATA[invalidHeaderValues]]></code>
<code><![CDATA[invalidProtocolVersionProvider]]></code>
<code><![CDATA[numericHeaderValuesProvider]]></code>
<code><![CDATA[validProtocolVersionProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/RelativeStreamTest.php">
<DocblockTypeContradiction>
Expand All @@ -341,11 +363,63 @@
<MixedOperand>
<code><![CDATA[$i]]></code>
</MixedOperand>
<PossiblyUnusedMethod>
<code><![CDATA[absoluteForms]]></code>
<code><![CDATA[headersWithContinuationLines]]></code>
<code><![CDATA[headersWithWhitespace]]></code>
<code><![CDATA[invalidRequestLines]]></code>
<code><![CDATA[messagesWithInvalidHeaders]]></code>
<code><![CDATA[originForms]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/RequestTest.php">
<MixedArgument>
<code><![CDATA[$headers]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[customRequestMethods]]></code>
<code><![CDATA[headersWithInjectionVectors]]></code>
<code><![CDATA[hostHeaderKeys]]></code>
<code><![CDATA[invalidHeaderTypes]]></code>
<code><![CDATA[invalidMethod]]></code>
<code><![CDATA[invalidRequestBody]]></code>
<code><![CDATA[invalidRequestMethod]]></code>
<code><![CDATA[requestsWithUri]]></code>
<code><![CDATA[validRequestTargets]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/HtmlResponseTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[invalidHtmlContent]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/JsonResponseTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[scalarValuesForJSON]]></code>
<code><![CDATA[valuesToJsonEncode]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/RedirectResponseTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[invalidUris]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/SerializerTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[headersWithContinuationLines]]></code>
<code><![CDATA[headersWithWhitespace]]></code>
<code><![CDATA[messagesWithInvalidHeaders]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/TextResponseTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[invalidContent]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/Response/XmlResponseTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[invalidContent]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/ResponseTest.php">
<MixedArgumentTypeCoercion>
Expand All @@ -355,6 +429,14 @@
<MixedAssignment>
<code><![CDATA[$responseCode]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[headersWithInjectionVectors]]></code>
<code><![CDATA[ianaCodesReasonPhrasesProvider]]></code>
<code><![CDATA[invalidHeaderTypes]]></code>
<code><![CDATA[invalidResponseBody]]></code>
<code><![CDATA[invalidStatusCodes]]></code>
<code><![CDATA[validStatusCodes]]></code>
</PossiblyUnusedMethod>
<StringIncrement>
<code><![CDATA[$value]]></code>
</StringIncrement>
Expand All @@ -363,11 +445,34 @@
<InvalidArgument>
<code><![CDATA[$normalizedFiles['fooFiles']]]></code>
</InvalidArgument>
<PossiblyUnusedMethod>
<code><![CDATA[cookieHeaderValues]]></code>
<code><![CDATA[invalidHostHeaders]]></code>
<code><![CDATA[marshalProtocolVersionProvider]]></code>
<code><![CDATA[serverContentMap]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/ServerRequestFilter/FilterUsingXForwardedHeadersTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[trustedProxyList]]></code>
<code><![CDATA[trustedReservedNetworkList]]></code>
<code><![CDATA[unreservedNetworkAddressList]]></code>
<code><![CDATA[untrustedProxyList]]></code>
<code><![CDATA[xForwardedProtoValues]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/ServerRequestFilter/IPRangeTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[combinedData]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/ServerRequestTest.php">
<InvalidArgument>
<code><![CDATA[$parsedBody]]></code>
</InvalidArgument>
<PossiblyUnusedMethod>
<code><![CDATA[provideMethods]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/StaticAnalysis/RequestInterfaceStaticReturnTypes.php">
<UnusedClass>
Expand Down Expand Up @@ -398,6 +503,18 @@
<code><![CDATA[$path]]></code>
<code><![CDATA[$streamOrFile]]></code>
</MixedArgument>
<PossiblyUnusedMethod>
<code><![CDATA[errorConstantsAndMessages]]></code>
<code><![CDATA[invalidErrorStatuses]]></code>
<code><![CDATA[invalidMovePaths]]></code>
<code><![CDATA[invalidStreams]]></code>
<code><![CDATA[nonOkErrorStatus]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/UriFactoryTest.php">
<PossiblyUnusedMethod>
<code><![CDATA[httpsDisableParamProvider]]></code>
</PossiblyUnusedMethod>
</file>
<file src="test/UriTest.php">
<MixedArgument>
Expand All @@ -406,6 +523,20 @@
<MixedAssignment>
<code><![CDATA[$test]]></code>
</MixedAssignment>
<PossiblyUnusedMethod>
<code><![CDATA[authorityInfo]]></code>
<code><![CDATA[invalidPaths]]></code>
<code><![CDATA[invalidPorts]]></code>
<code><![CDATA[invalidQueryStrings]]></code>
<code><![CDATA[invalidSchemes]]></code>
<code><![CDATA[mutations]]></code>
<code><![CDATA[queryStringsForEncoding]]></code>
<code><![CDATA[standardSchemePortCombinations]]></code>
<code><![CDATA[userInfoProvider]]></code>
<code><![CDATA[utf8PathsDataProvider]]></code>
<code><![CDATA[utf8QueryStringsDataProvider]]></code>
<code><![CDATA[validPorts]]></code>
</PossiblyUnusedMethod>
<PossiblyUnusedParam>
<code><![CDATA[$query]]></code>
</PossiblyUnusedParam>
Expand Down
8 changes: 4 additions & 4 deletions test/CallbackStreamTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
namespace LaminasTest\Diactoros;

use Laminas\Diactoros\CallbackStream;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use RuntimeException;

/**
* @covers \Laminas\Diactoros\CallbackStream
*/
#[CoversClass(CallbackStream::class)]
final class CallbackStreamTest extends TestCase
{
public function testToString(): void
Expand Down Expand Up @@ -188,10 +188,10 @@ public static function phpCallbacksForStreams(): array
}

/**
* @dataProvider phpCallbacksForStreams
* @param callable(): string $callback
* @param non-empty-string $expected
*/
#[DataProvider('phpCallbacksForStreams')]
public function testAllowsArbitraryPhpCallbacks(callable $callback, string $expected): void
{
$stream = new CallbackStream($callback);
Expand Down
16 changes: 9 additions & 7 deletions test/HeaderSecurityTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

use InvalidArgumentException;
use Laminas\Diactoros\HeaderSecurity;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\TestCase;

final class HeaderSecurityTest extends TestCase
Expand Down Expand Up @@ -34,11 +36,11 @@ public static function getFilterValues(): array
}

/**
* @dataProvider getFilterValues
* @group ZF2015-04
* @param non-empty-string $value
* @param non-empty-string $expected
*/
#[DataProvider('getFilterValues')]
#[Group('ZF2015-04')]
public function testFiltersValuesPerRfc7230(string $value, string $expected): void
{
$this->assertSame($expected, HeaderSecurity::filter($value));
Expand Down Expand Up @@ -67,10 +69,10 @@ public static function validateValues(): array
}

/**
* @dataProvider validateValues
* @group ZF2015-04
* @param non-empty-string $value
*/
#[DataProvider('validateValues')]
#[Group('ZF2015-04')]
public function testValidatesValuesPerRfc7230(string $value, bool $expected): void
{
self::assertSame($expected, HeaderSecurity::isValid($value));
Expand All @@ -95,10 +97,10 @@ public static function assertValues(): array
}

/**
* @dataProvider assertValues
* @group ZF2015-04
* @param non-empty-string $value
*/
#[DataProvider('assertValues')]
#[Group('ZF2015-04')]
public function testAssertValidRaisesExceptionForInvalidValue(string $value): void
{
$this->expectException(InvalidArgumentException::class);
Expand All @@ -121,9 +123,9 @@ public static function assertNames(): array
}

/**
* @dataProvider assertNames
* @param non-empty-string $value
*/
#[DataProvider('assertNames')]
public function testAssertValidNameRaisesExceptionForInvalidName(string $value): void
{
$this->expectException(InvalidArgumentException::class);
Expand Down
Loading