Check default property value against native type

phpstan · Jun 3, 2020 · 4329b07 · 4329b07
1 parent 5d76184
commit 4329b07
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/build.xml b/build.xml
@@ -141,6 +141,8 @@
 			<arg path="tests/PHPStan/Rules/Classes/data/interface-extends-error.php"/>
 			<arg value="--exclude"/>
 			<arg path="tests/PHPStan/Rules/Classes/data/trait-use-error.php"/>
+			<arg value="--exclude"/>
+			<arg path="tests/PHPStan/Rules/Properties/data/default-value-for-native-property-type.php"/>
 			<arg path="src" />
 			<arg path="tests" />
 			<arg path="compiler/src" />

diff --git a/src/Rules/Properties/DefaultValueTypesAssignedToPropertiesRule.php b/src/Rules/Properties/DefaultValueTypesAssignedToPropertiesRule.php
@@ -7,6 +7,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
+use PHPStan\Type\MixedType;
 use PHPStan\Type\VerbosityLevel;
 
 /**
@@ -41,12 +42,13 @@ public function processNode(Node $node, Scope $scope): array
 				continue;
 			}
 
-			if ($property->default instanceof Node\Expr\ConstFetch && (string) $property->default->name === 'null') {
-				continue;
-			}
-
 			$propertyReflection = $classReflection->getNativeProperty($property->name->name);
 			$propertyType = $propertyReflection->getWritableType();
+			if ($propertyReflection->getNativeType() instanceof MixedType) {
+				if ($property->default instanceof Node\Expr\ConstFetch && (string) $property->default->name === 'null') {
+					continue;
+				}
+			}
 			$defaultValueType = $scope->getType($property->default);
 			if ($this->ruleLevelHelper->accepts($propertyType, $defaultValueType, $scope->isDeclareStrictTypes())) {
 				continue;

diff --git a/tests/PHPStan/Rules/Properties/DefaultValueTypesAssignedToPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/DefaultValueTypesAssignedToPropertiesRuleTest.php
@@ -34,4 +34,17 @@ public function testDefaultValueTypesAssignedToProperties(): void
 		]);
 	}
 
+	public function testDefaultValueForNativePropertyType(): void
+	{
+		if (!self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires static reflection.');
+		}
+		$this->analyse([__DIR__ . '/data/default-value-for-native-property-type.php'], [
+			[
+				'Property DefaultValueForNativePropertyType\Foo::$foo (DateTime) does not accept default value of type null.',
+				8,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Properties/data/default-value-for-native-property-type.php b/tests/PHPStan/Rules/Properties/data/default-value-for-native-property-type.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace DefaultValueForNativePropertyType;
+
+class Foo
+{
+
+	private \DateTime $foo = null;
+
+}