From b1d24fbdb7d1cc948c946295035dad6df550fb7e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 27 Dec 2024 12:12:49 +0100 Subject: PHPStan 2.0 (#7131) * PHPStan 2.0 fix https://github.com/FreshRSS/FreshRSS/issues/6989 https://github.com/phpstan/phpstan/releases/tag/2.0.0 https://github.com/phpstan/phpstan/blob/2.0.x/UPGRADING.md * More * More * Done * fix i18n CLI * Restore a PHPStan Next test For work towards PHPStan Level 10 * 4 more on Level 10 * fix getTagsForEntry * API at Level 10 * More Level 10 * Finish Minz at Level 10 * Finish CLI at Level 10 * Finish Controllers at Level 10 * More Level 10 * More * Pass bleedingEdge * Clean PHPStan options and add TODOs * Level 10 for main config * More * Consitency array vs. list * Sanitize themes get_infos * Simplify TagDAO->getTagsForEntries() * Finish reportAnyTypeWideningInVarTag * Prepare checkBenevolentUnionTypes and checkImplicitMixed * Fixes * Refix * Another fix * Casing of __METHOD__ constant --- tests/cli/CliOptionsParserTest.php | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'tests/cli/CliOptionsParserTest.php') diff --git a/tests/cli/CliOptionsParserTest.php b/tests/cli/CliOptionsParserTest.php index 046617721..7aa9cdac3 100644 --- a/tests/cli/CliOptionsParserTest.php +++ b/tests/cli/CliOptionsParserTest.php @@ -54,131 +54,131 @@ class CliOptionsParserTest extends TestCase { public static function testInvalidOptionSetWithValueReturnsError(): void { $result = self::runOptionalOptions('--invalid=invalid'); - self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + self::assertSame(['invalid' => 'unknown option: invalid'], $result->errors); } public static function testInvalidOptionSetWithoutValueReturnsError(): void { $result = self::runOptionalOptions('--invalid'); - self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + self::assertSame(['invalid' => 'unknown option: invalid'], $result->errors); } public static function testValidOptionSetWithValidValueAndInvalidOptionSetWithValueReturnsValueForValidOptionAndErrorForInvalidOption(): void { $result = self::runOptionalOptions('--string=string --invalid=invalid'); - self::assertEquals('string', $result->string); - self::assertEquals(['invalid' => 'unknown option: invalid'], $result->errors); + self::assertSame('string', $result->string); + self::assertSame(['invalid' => 'unknown option: invalid'], $result->errors); } public static function testOptionWithValueTypeOfStringSetOnceWithValidValueReturnsValueAsString(): void { $result = self::runOptionalOptions('--string=string'); - self::assertEquals('string', $result->string); + self::assertSame('string', $result->string); } public static function testOptionWithRequiredValueTypeOfIntSetOnceWithValidValueReturnsValueAsInt(): void { $result = self::runOptionalOptions('--int=111'); - self::assertEquals(111, $result->int); + self::assertSame(111, $result->int); } public static function testOptionWithRequiredValueTypeOfBoolSetOnceWithValidValueReturnsValueAsBool(): void { $result = self::runOptionalOptions('--bool=on'); - self::assertEquals(true, $result->bool); + self::assertTrue($result->bool); } public static function testOptionWithValueTypeOfArrayOfStringSetOnceWithValidValueReturnsValueAsArrayOfString(): void { $result = self::runOptionalOptions('--array-of-string=string'); - self::assertEquals(['string'], $result->arrayOfString); + self::assertSame(['string'], $result->arrayOfString); } public static function testOptionWithValueTypeOfStringSetMultipleTimesWithValidValueReturnsLastValueSetAsString(): void { $result = self::runOptionalOptions('--string=first --string=second'); - self::assertEquals('second', $result->string); + self::assertSame('second', $result->string); } public static function testOptionWithValueTypeOfIntSetMultipleTimesWithValidValueReturnsLastValueSetAsInt(): void { $result = self::runOptionalOptions('--int=111 --int=222'); - self::assertEquals(222, $result->int); + self::assertSame(222, $result->int); } public static function testOptionWithValueTypeOfBoolSetMultipleTimesWithValidValueReturnsLastValueSetAsBool(): void { $result = self::runOptionalOptions('--bool=on --bool=off'); - self::assertEquals(false, $result->bool); + self::assertFalse($result->bool); } public static function testOptionWithValueTypeOfArrayOfStringSetMultipleTimesWithValidValueReturnsAllSetValuesAsArrayOfString(): void { $result = self::runOptionalOptions('--array-of-string=first --array-of-string=second'); - self::assertEquals(['first', 'second'], $result->arrayOfString); + self::assertSame(['first', 'second'], $result->arrayOfString); } public static function testOptionWithValueTypeOfIntSetWithInvalidValueReturnsAnError(): void { $result = self::runOptionalOptions('--int=one'); - self::assertEquals(['int' => 'invalid input: int must be an integer'], $result->errors); + self::assertSame(['int' => 'invalid input: int must be an integer'], $result->errors); } public static function testOptionWithValueTypeOfBoolSetWithInvalidValuesReturnsAnError(): void { $result = self::runOptionalOptions('--bool=bad'); - self::assertEquals(['bool' => 'invalid input: bool must be a boolean'], $result->errors); + self::assertSame(['bool' => 'invalid input: bool must be a boolean'], $result->errors); } public static function testOptionWithValueTypeOfIntSetMultipleTimesWithValidAndInvalidValuesReturnsLastValidValueSetAsIntAndError(): void { $result = self::runOptionalOptions('--int=111 --int=one --int=222 --int=two'); - self::assertEquals(222, $result->int); - self::assertEquals(['int' => 'invalid input: int must be an integer'], $result->errors); + self::assertSame(222, $result->int); + self::assertSame(['int' => 'invalid input: int must be an integer'], $result->errors); } public static function testOptionWithValueTypeOfBoolSetMultipleTimesWithWithValidAndInvalidValuesReturnsLastValidValueSetAsBoolAndError(): void { $result = self::runOptionalOptions('--bool=on --bool=good --bool=off --bool=bad'); - self::assertEquals(false, $result->bool); - self::assertEquals(['bool' => 'invalid input: bool must be a boolean'], $result->errors); + self::assertFalse($result->bool); + self::assertSame(['bool' => 'invalid input: bool must be a boolean'], $result->errors); } public static function testNotSetOptionWithDefaultInputReturnsDefaultInput(): void { $result = self::runOptionalOptions(''); - self::assertEquals('default', $result->defaultInput); + self::assertSame('default', $result->defaultInput); } public static function testOptionWithDefaultInputSetWithValidValueReturnsCorrectlyTypedValue(): void { $result = self::runOptionalOptions('--default-input=input'); - self::assertEquals('input', $result->defaultInput); + self::assertSame('input', $result->defaultInput); } public static function testOptionWithOptionalValueSetWithoutValueReturnsEmptyString(): void { $result = self::runOptionalOptions('--optional-value'); - self::assertEquals('', $result->optionalValue); + self::assertSame('', $result->optionalValue); } public static function testOptionWithOptionalValueDefaultSetWithoutValueReturnsOptionalValueDefault(): void { $result = self::runOptionalOptions('--optional-value-with-default'); - self::assertEquals(true, $result->optionalValueWithDefault); + self::assertTrue($result->optionalValueWithDefault); } public static function testNotSetOptionWithOptionalValueDefaultAndDefaultInputReturnsDefaultInput(): void { $result = self::runOptionalOptions(''); - self::assertEquals('default', $result->defaultInputAndOptionalValueWithDefault); + self::assertSame('default', $result->defaultInputAndOptionalValueWithDefault); } public static function testOptionWithOptionalValueDefaultAndDefaultInputSetWithoutValueReturnsOptionalValueDefault(): void { $result = self::runOptionalOptions('--default-input-and-optional-value-with-default'); - self::assertEquals('optional', $result->defaultInputAndOptionalValueWithDefault); + self::assertSame('optional', $result->defaultInputAndOptionalValueWithDefault); } public static function testRequiredOptionNotSetReturnsError(): void { $result = self::runOptionalAndRequiredOptions(''); - self::assertEquals(['required' => 'invalid input: required cannot be empty'], $result->errors); + self::assertSame(['required' => 'invalid input: required cannot be empty'], $result->errors); } public static function testOptionSetWithDeprecatedAliasGeneratesDeprecationWarningAndReturnsValue(): void { $result = self::runCommandReadingStandardError('--deprecated-string=string'); - self::assertEquals('FreshRSS deprecation warning: the CLI option(s): deprecated-string are deprecated ' . + self::assertSame('FreshRSS deprecation warning: the CLI option(s): deprecated-string are deprecated ' . 'and will be removed in a future release. Use: string instead', $result ); $result = self::runOptionalOptions('--deprecated-string=string'); - self::assertEquals('string', $result->string); + self::assertSame('string', $result->string); } public static function testAlwaysReturnUsageMessageWithUsageInfoForAllOptions(): void { $result = self::runOptionalAndRequiredOptions(''); - self::assertEquals('Usage: cli-parser-test.php --required= [-s --string=] [-i --int=] [-b --bool=] [-f --flag]', + self::assertSame('Usage: cli-parser-test.php --required= [-s --string=] [-i --int=] [-b --bool=] [-f --flag]', $result->usage, ); } -- cgit v1.2.3