Commit e3c0981

VincentLangletondrejmirtes

authored and

committed

Support auto encoding

1 parent 163d178 commit e3c0981Copy full SHA for e3c0981

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`use PHPStan\Type\UnionType;`
`21`	`21`	`use function count;`
`22`	`22`	`use function str_contains;`
	`23`	`+use function strtolower;`
	`24`	`+use function trim;`
`23`	`25`
`24`	`26`	`#[AutowiredService]`
`25`	`27`	`final class MbConvertEncodingFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension`
`@@ -81,7 +83,10 @@ public function getTypeFromFunctionCall(`
`81`	`83`	`$constantStrings = $fromEncodingArgType->getConstantStrings();`
`82`	`84`	`if (count($constantStrings) > 0) {`
`83`	`85`	`foreach ($constantStrings as $constantString) {`
`84`		`- if (str_contains($constantString->getValue(), ',')) {`
	`86`	`+ if (`
	`87`	`+ str_contains($constantString->getValue(), ',')`
	`88`	`+ \|\| trim(strtolower($constantString->getValue())) === 'auto'`
	`89`	`+ ) {`
`85`	`90`	`$returnFalseIfCannotDetectEncoding = true;`
`86`	`91`	`break;`
`87`	`92`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,7 @@ function test_mb_convert_encoding(`
`29`	`29`	`\PHPStan\Testing\assertType('list<int>\|false', mb_convert_encoding($intList, 'UTF-8'));`
`30`	`30`	`\PHPStan\Testing\assertType('array{foo: string, bar: int, baz: string}\|string\|false', mb_convert_encoding($union, 'UTF-8'));`
`31`	`31`	`\PHPStan\Testing\assertType('array\|string\|false', mb_convert_encoding($int, 'UTF-8'));`
	`32`	`+`
	`33`	`+ \PHPStan\Testing\assertType('string\|false', mb_convert_encoding($string, 'UTF-8', 'auto'));`
	`34`	`+ \PHPStan\Testing\assertType('string\|false', mb_convert_encoding($string, 'UTF-8', ' AUTO '));`
`32`	`35`	`};`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,7 @@ function test_mb_convert_encoding(`
`42`	`42`	`\PHPStan\Testing\assertType('list<string>', mb_convert_encoding($stringList, 'UTF-8', ['FOO']));`
`43`	`43`	`\PHPStan\Testing\assertType('list<string>\|false', mb_convert_encoding($stringList, 'UTF-8', ['FOO', 'BAR']));`
`44`	`44`	`\PHPStan\Testing\assertType('list<string>', mb_convert_encoding($stringList, 'UTF-8', ['FOO,BAR']));`
	`45`	`+`
	`46`	`+ \PHPStan\Testing\assertType('string\|false', mb_convert_encoding($string, 'UTF-8', 'auto'));`
	`47`	`+ \PHPStan\Testing\assertType('string\|false', mb_convert_encoding($string, 'UTF-8', ' AUTO '));`
`45`	`48`	`};`

Comments

(0)