Commit da248b2

rvanvelzenondrejmirtes

authored and

committed

Retain sort order in intersection type

1 parent a72e39c commit da248b2Copy full SHA for da248b2

File tree

2 files changed

+24

-12

lines changed

src/Type
- IntersectionType.php
tests/PHPStan/Analyser/data
- callable-object.php

2 files changed

+24

-12

lines changed

`‎src/Type/IntersectionType.php‎`

Lines changed: 15 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`use function count;`
`31`	`31`	`use function implode;`
`32`	`32`	`use function in_array;`
	`33`	`+use function ksort;`
`33`	`34`	`use function sprintf;`
`34`	`35`	`use function strlen;`
`35`	`36`	`use function substr;`
`@@ -206,7 +207,7 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)`
`206`	`207`
`207`	`208`	`$nonEmptyStr = false;`
`208`	`209`	`$nonFalsyStr = false;`
`209`		`- foreach ($this->getSortedTypes() as $type) {`
	`210`	`+ foreach ($this->getSortedTypes() as $i => $type) {`
`210`	`211`	`if ($type instanceof AccessoryNonEmptyStringType`
`211`	`212`	`\|\| $type instanceof AccessoryLiteralStringType`
`212`	`213`	`\|\| $type instanceof AccessoryNumericStringType`
`@@ -229,43 +230,43 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)`
`229`	`230`	`}`
`230`	`231`	`}`
`231`	`232`
`232`		`- $typesToDescribe[] = $type;`
	`233`	`+ $typesToDescribe[$i] = $type;`
`233`	`234`	`$skipTypeNames[] = 'string';`
`234`	`235`	`continue;`
`235`	`236`	`}`
`236`	`237`	`if ($type instanceof NonEmptyArrayType \|\| $type instanceof AccessoryArrayListType) {`
`237`		`- $typesToDescribe[] = $type;`
	`238`	`+ $typesToDescribe[$i] = $type;`
`238`	`239`	`$skipTypeNames[] = 'array';`
`239`	`240`	`continue;`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`if ($type instanceof CallableType && $type->isCommonCallable()) {`
`243`		`- $typesToDescribe[] = $type;`
	`244`	`+ $typesToDescribe[$i] = $type;`
`244`	`245`	`$skipTypeNames[] = 'object';`
`245`	`246`	`$skipTypeNames[] = 'string';`
`246`	`247`	`continue;`
`247`	`248`	`}`
`248`	`249`
`249`	`250`	`if (!$type instanceof AccessoryType) {`
`250`		`- $baseTypes[] = $type;`
	`251`	`+ $baseTypes[$i] = $type;`
`251`	`252`	`continue;`
`252`	`253`	`}`
`253`	`254`
`254`	`255`	`if ($skipAccessoryTypes) {`
`255`	`256`	`continue;`
`256`	`257`	`}`
`257`	`258`
`258`		`- $typesToDescribe[] = $type;`
	`259`	`+ $typesToDescribe[$i] = $type;`
`259`	`260`	`}`
`260`	`261`
`261`	`262`	`$describedTypes = [];`
`262`		`- foreach ($baseTypes as $type) {`
	`263`	`+ foreach ($baseTypes as $i => $type) {`
`263`	`264`	`$typeDescription = $type->describe($level);`
`264`	`265`
`265`	`266`	`if (in_array($typeDescription, ['object', 'string'], true) && in_array($typeDescription, $skipTypeNames, true)) {`
`266`	`267`	`foreach ($typesToDescribe as $j => $typeToDescribe) {`
`267`	`268`	`if ($typeToDescribe instanceof CallableType && $typeToDescribe->isCommonCallable()) {`
`268`		`- $describedTypes[] = 'callable-' . $typeDescription;`
	`269`	`+ $describedTypes[$i] = 'callable-' . $typeDescription;`
`269`	`270`	`unset($typesToDescribe[$j]);`
`270`	`271`	`continue 2;`
`271`	`272`	`}`
`@@ -298,21 +299,23 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)`
`298`	`299`	`$typeName = 'non-empty-' . $typeName;`
`299`	`300`	`}`
`300`	`301`
`301`		`- $describedTypes[] = $typeName . '<' . substr($typeDescription, strlen('array<'));`
	`302`	`+ $describedTypes[$i] = $typeName . '<' . substr($typeDescription, strlen('array<'));`
`302`	`303`	`continue;`
`303`	`304`	`}`
`304`	`305`
`305`	`306`	`if (in_array($typeDescription, $skipTypeNames, true)) {`
`306`	`307`	`continue;`
`307`	`308`	`}`
`308`	`309`
`309`		`- $describedTypes[] = $type->describe($level);`
	`310`	`+ $describedTypes[$i] = $type->describe($level);`
`310`	`311`	`}`
`311`	`312`
`312`		`- foreach ($typesToDescribe as $typeToDescribe) {`
`313`		`- $describedTypes[] = $typeToDescribe->describe($level);`
	`313`	`+ foreach ($typesToDescribe as $i => $typeToDescribe) {`
	`314`	`+ $describedTypes[$i] = $typeToDescribe->describe($level);`
`314`	`315`	`}`
`315`	`316`
	`317`	`+ ksort($describedTypes);`
	`318`	`+`
`316`	`319`	`return implode('&', $describedTypes);`
`317`	`320`	`}`
`318`	`321`

`‎tests/PHPStan/Analyser/data/callable-object.php‎`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace CallableObject;`
`4`	`4`
	`5`	`+use Iterator;`
`5`	`6`	`use function PHPStan\Testing\assertType;`
`6`	`7`
`7`	`8`	`/**`
`@@ -27,3 +28,11 @@ function foo(callable $callable, $object, $callableObject)`
`27`	`28`	`assertType('callable-object', $object);`
`28`	`29`	`}`
`29`	`30`	`}`
	`31`	`+`
	`32`	`+/**`
	`33`	`+ * @param Iterator&callable $object`
	`34`	`+ */`
	`35`	`+function bar($object)`
	`36`	`+{`
	`37`	`+ assertType('callable(): mixed&Iterator', $object);`
	`38`	`+}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit da248b2

File tree

2 files changed

2 files changed

`‎src/Type/IntersectionType.php‎`

`‎tests/PHPStan/Analyser/data/callable-object.php‎`

0 commit comments