coerce arguments also in non-strict type mode

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5641,18 +5641,12 @@ static function (): void {
 
 						if ($assignedTypeIsCompatible) {
 							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
-						} elseif ($scope->isDeclareStrictTypes()) {
+						} else {
 							$scope = $scope->assignExpression(
 								$var,
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
-						} else {
-							$scope = $scope->assignExpression(
-								$var,
-								TypeCombinator::intersect($assignedExprType, $propertyNativeType),
-								TypeCombinator::intersect($assignedNativeType, $propertyNativeType),
-							);
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
@@ -5735,18 +5729,12 @@ static function (): void {
 
 						if ($assignedTypeIsCompatible) {
 							$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);
-						} elseif ($scope->isDeclareStrictTypes()) {
+						} else {
 							$scope = $scope->assignExpression(
 								$var,
 								TypeCombinator::intersect($assignedExprType->toCoercedArgumentType(true), $propertyNativeType),
 								TypeCombinator::intersect($assignedNativeType->toCoercedArgumentType(true), $propertyNativeType),
 							);
-						} else {
-							$scope = $scope->assignExpression(
-								$var,
-								TypeCombinator::intersect($assignedExprType, $propertyNativeType),
-								TypeCombinator::intersect($assignedNativeType, $propertyNativeType),
-							);
 						}
 					} else {
 						$scope = $scope->assignExpression($var, $assignedExprType, $assignedNativeType);

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

@@ -0,0 +1,145 @@
+<?php declare(strict_types = 0);
+
+namespace Bug12393b;
+
+use function PHPStan\Testing\assertNativeType;
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	private string $name;
+
+	/** @var string */
+	private $untypedName;
+
+	private float $float;
+
+	/** @var float */
+	private $untypedFloat;
+
+	private array $a;
+
+	/**
+	 * @param mixed[] $plugin
+	 */
+	public function __construct(array $plugin){
+		$this->name = $plugin["name"];
+		assertType('string', $this->name);
+	}
+
+	/**
+	 * @param mixed[] $plugin
+	 */
+	public function doFoo(array $plugin){
+		$this->untypedName = $plugin["name"];
+		assertType('mixed', $this->untypedName);
+	}
+
+	public function doBar(int $i){
+		$this->float = $i;
+		assertType('float', $this->float);
+	}
+
+	public function doBaz(int $i){
+		$this->untypedFloat = $i;
+		assertType('int', $this->untypedFloat);
+	}
+
+	public function doLorem(): void
+	{
+		$this->a = ['a' => 1];
+		assertType('array{a: 1}', $this->a);
+	}
+
+	public function doFloatTricky(){
+		$this->float = 1;
+		assertType('1.0', $this->float);
+	}
+}
+
+class HelloWorldStatic
+{
+	private static string $name;
+
+	/** @var string */
+	private static $untypedName;
+
+	private static float $float;
+
+	/** @var float */
+	private static $untypedFloat;
+
+	private static array $a;
+
+	/**
+	 * @param mixed[] $plugin
+	 */
+	public function __construct(array $plugin){
+		self::$name = $plugin["name"];
+		assertType('string', self::$name);
+	}
+
+	/**
+	 * @param mixed[] $plugin
+	 */
+	public function doFoo(array $plugin){
+		self::$untypedName = $plugin["name"];
+		assertType('mixed', self::$untypedName);
+	}
+
+	public function doBar(int $i){
+		self::$float = $i;
+		assertType('float', self::$float);
+	}
+
+	public function doBaz(int $i){
+		self::$untypedFloat = $i;
+		assertType('int', self::$untypedFloat);
+	}
+
+	public function doLorem(): void
+	{
+		self::$a = ['a' => 1];
+		assertType('array{a: 1}', self::$a);
+	}
+}
+
+class EntryPointLookup
+{
+
+	/** @var array<string, mixed>|null */
+	private ?array $entriesData = null;
+
+	/**
+	 * @return array<string, mixed>
+	 */
+	public function doFoo(): void
+	{
+		if ($this->entriesData !== null) {
+			return;
+		}
+
+		assertType('null', $this->entriesData);
+		assertNativeType('null', $this->entriesData);
+
+		$data = $this->getMixed();
+		if ($data !== null) {
+			$this->entriesData = $data;
+			assertType('array', $this->entriesData);
+			assertNativeType('array', $this->entriesData);
+			return;
+		}
+
+		assertType('null', $this->entriesData);
+		assertNativeType('null', $this->entriesData);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getMixed()
+	{
+
+	}
+
+}