more precise strings

Author: staabm

src/Type/Accessory/AccessoryLiteralStringType.php

@@ -217,7 +217,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/Accessory/AccessoryLowercaseStringType.php

@@ -214,7 +214,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/Accessory/AccessoryNonEmptyStringType.php

@@ -214,7 +214,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/Accessory/AccessoryNonFalsyStringType.php

@@ -216,7 +216,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/Accessory/AccessoryNumericStringType.php

@@ -216,7 +216,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/Accessory/AccessoryUppercaseStringType.php

@@ -214,7 +214,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

src/Type/StringType.php

@@ -184,7 +184,7 @@ public function toArrayKey(): Type
 	public function toCoercedArgumentType(bool $strictTypes): Type
 	{
 		if (!$strictTypes) {
-			return TypeCombinator::union(new IntegerType(), new FloatType(), new StringType(), new BooleanType());
+			return TypeCombinator::union($this->toInteger(), $this->toFloat(), $this, $this->toBoolean());
 		}
 
 		return $this;

tests/PHPStan/Analyser/nsrt/bug-12393b.php

@@ -160,7 +160,7 @@ public function doFoo(string $s): void
 	public function doBar(): void
 	{
 		$this->foo = 'foo';
-		assertType('int', $this->foo);
+		assertType('0', $this->foo);
 	}
 }
 
@@ -292,7 +292,7 @@ public function doFoo(string $b): void
 	public function doBar(): void
 	{
 		$this->foo = "1.0";
-		assertType('float|int', $this->foo);
+		assertType('1|1.0', $this->foo);
 	}
 }