Commit 428ba86

committed

fix class-string<*> being supertype of any string literal

1 parent a849f06 commit 428ba86Copy full SHA for 428ba86

File tree

+37

-1

lines changed

+37

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic`
`94`	`94`	`if ($type instanceof ConstantStringType) {`
`95`	`95`	`$genericType = $this->type;`
`96`	`96`	`if ($genericType instanceof MixedType) {`
`97`		`- return TrinaryLogic::createYes();`
	`97`	`+ return $type->isClassStringType();`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if ($genericType instanceof StaticType) {`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1252,6 +1252,12 @@ public function testBug10049(): void`
`1252`	`1252`	`$this->assertNoErrors($errors);`
`1253`	`1253`	`}`
`1254`	`1254`
	`1255`	`+ public function testBug10076(): void`
	`1256`	`+ {`
	`1257`	`+ $errors = $this->runAnalyse(__DIR__ . '/data/bug-10076.php');`
	`1258`	`+ $this->assertNoErrors($errors);`
	`1259`	`+ }`
	`1260`	`+`
`1255`	`1261`	`/**`
`1256`	`1262`	`* @param string[]\|null $allAnalysedFiles`
`1257`	`1263`	`* @return Error[]`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespace Bug10076;`
	`4`	`+`
	`5`	`+/**`
	`6`	`+ * @template T`
	`7`	`+ *`
	`8`	`+ * @param 'object'\|'array'\|class-string<T> $type`
	`9`	`+ *`
	`10`	`+ * @return list<mixed>`
	`11`	`+ */`
	`12`	`+function result($type = 'object'): array`
	`13`	`+{`
	`14`	`+ return [];`
	`15`	`+}`
	`16`	`+`
	`17`	`+result();`
	`18`	`+result('object');`
	`19`	`+result('array');`
	`20`	`+result(\DateTime::class);`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,16 @@ public function dataIsSuperTypeOf(): array`
`155`	`155`	`new ConstantStringType(IntegerType::class),`
`156`	`156`	`TrinaryLogic::createMaybe(),`
`157`	`157`	`],`
	`158`	`+ 19 => [`
	`159`	`+ new GenericClassStringType(TemplateTypeFactory::create(`
	`160`	`+ TemplateTypeScope::createWithFunction('foo'),`
	`161`	`+ 'T',`
	`162`	`+ null,`
	`163`	`+ TemplateTypeVariance::createInvariant(),`
	`164`	`+ )),`
	`165`	`+ new ConstantStringType('array'),`
	`166`	`+ TrinaryLogic::createNo(),`
	`167`	`+ ],`
`158`	`168`	`];`
`159`	`169`	`}`
`160`	`170`

Comments

(0)