Fix/issue 6791

.github/workflows/backward-compatibility.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   backward-compatibility:

.github/workflows/compiler-tests.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   compiler-tests:

.github/workflows/e2e-tests.yml

@@ -13,7 +13,7 @@ on:
       - 'compiler/**'
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   result-cache-e2e-tests:

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ on:
       - "master"
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   lint:

.github/workflows/static-analysis.yml

@@ -13,7 +13,7 @@ on:
       - 'compiler/**'
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   static-analysis:

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ on:
       - 'compiler/**'
 
 env:
-  COMPOSER_ROOT_VERSION: "1.4.x-dev"
+  COMPOSER_ROOT_VERSION: "1.5.x-dev"
 
 jobs:
   tests:

composer.json

@@ -74,7 +74,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.4-dev"
+			"dev-master": "1.5-dev"
 		},
 		"patcher": {
 			"search": "patches"

src/Analyser/MutatingScope.php

@@ -2660,7 +2660,14 @@ private function resolveType(Expr $node): Type
 					continue;
 				}
 
-				return $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall($functionReflection, $node, $this);
+				$resolvedType = $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall(
+					$functionReflection,
+					$node,
+					$this,
+				);
+				if ($resolvedType !== null) {
+					return $resolvedType;
+				}
 			}
 
 			return ParametersAcceptorSelector::selectFromArgs(
@@ -5659,7 +5666,16 @@ private function exactInstantiation(New_ $node, string $className): ?Type
 				continue;
 			}
 
-			$resolvedTypes[] = $dynamicStaticMethodReturnTypeExtension->getTypeFromStaticMethodCall($constructorMethod, $methodCall, $this);
+			$resolvedType = $dynamicStaticMethodReturnTypeExtension->getTypeFromStaticMethodCall(
+				$constructorMethod,
+				$methodCall,
+				$this,
+			);
+			if ($resolvedType === null) {
+				continue;
+			}
+
+			$resolvedTypes[] = $resolvedType;
 		}
 
 		if (count($resolvedTypes) > 0) {
@@ -5835,15 +5851,29 @@ private function methodCallReturnType(Type $typeWithMethod, string $methodName,
 						continue;
 					}
 
-					$resolvedTypes[] = $dynamicMethodReturnTypeExtension->getTypeFromMethodCall($methodReflection, $methodCall, $this);
+					$resolvedType = $dynamicMethodReturnTypeExtension->getTypeFromMethodCall($methodReflection, $methodCall, $this);
+					if ($resolvedType === null) {
+						continue;
+					}
+
+					$resolvedTypes[] = $resolvedType;
 				}
 			} else {
 				foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicStaticMethodReturnTypeExtensionsForClass($className) as $dynamicStaticMethodReturnTypeExtension) {
 					if (!$dynamicStaticMethodReturnTypeExtension->isStaticMethodSupported($methodReflection)) {
 						continue;
 					}
 
-					$resolvedTypes[] = $dynamicStaticMethodReturnTypeExtension->getTypeFromStaticMethodCall($methodReflection, $methodCall, $this);
+					$resolvedType = $dynamicStaticMethodReturnTypeExtension->getTypeFromStaticMethodCall(
+						$methodReflection,
+						$methodCall,
+						$this,
+					);
+					if ($resolvedType === null) {
+						continue;
+					}
+
+					$resolvedTypes[] = $resolvedType;
 				}
 			}
 		}

src/Analyser/NodeScopeResolver.php

@@ -3325,7 +3325,11 @@ static function (): void {
 				if ($propertyReflection->canChangeTypeAfterAssignment()) {
 					$scope = $scope->assignExpression($var, $assignedExprType);
 				}
-				if (!$propertyReflection->getWritableType()->isSuperTypeOf($assignedExprType)->yes()) {
+				$declaringClass = $propertyReflection->getDeclaringClass();
+				if (
+					$declaringClass->hasNativeProperty($propertyName)
+					&& !$declaringClass->getNativeProperty($propertyName)->getNativeType()->accepts($assignedExprType, true)->yes()
+				) {
 					$throwPoints[] = ThrowPoint::createExplicit($scope, new ObjectType(TypeError::class), $assignedExpr, false);
 				}
 			} else {