From bf19914cac1682d0eab8bf65a874ba368522311c Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Fri, 4 Oct 2024 09:51:05 +0200
Subject: [PATCH] Added missing rules to StubValidator

---
 src/PhpDoc/StubValidator.php | 20 ++++++++++++++++++++
 stubs/ReflectionClass.stub   |  5 -----
 stubs/ext-ds.stub            | 10 ----------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/PhpDoc/StubValidator.php b/src/PhpDoc/StubValidator.php
index a0539b7168..39ebcf09b3 100644
--- a/src/PhpDoc/StubValidator.php
+++ b/src/PhpDoc/StubValidator.php
@@ -47,6 +47,8 @@
 use PHPStan\Rules\Generics\ClassAncestorsRule;
 use PHPStan\Rules\Generics\ClassTemplateTypeRule;
 use PHPStan\Rules\Generics\CrossCheckInterfacesHelper;
+use PHPStan\Rules\Generics\EnumAncestorsRule;
+use PHPStan\Rules\Generics\EnumTemplateTypeRule;
 use PHPStan\Rules\Generics\FunctionSignatureVarianceRule;
 use PHPStan\Rules\Generics\FunctionTemplateTypeRule;
 use PHPStan\Rules\Generics\GenericAncestorsCheck;
@@ -58,8 +60,10 @@
 use PHPStan\Rules\Generics\MethodTagTemplateTypeRule;
 use PHPStan\Rules\Generics\MethodTagTemplateTypeTraitRule;
 use PHPStan\Rules\Generics\MethodTemplateTypeRule;
+use PHPStan\Rules\Generics\PropertyVarianceRule;
 use PHPStan\Rules\Generics\TemplateTypeCheck;
 use PHPStan\Rules\Generics\TraitTemplateTypeRule;
+use PHPStan\Rules\Generics\UsedTraitsRule;
 use PHPStan\Rules\Generics\VarianceCheck;
 use PHPStan\Rules\Methods\ExistingClassesInTypehintsRule;
 use PHPStan\Rules\Methods\MethodParameterComparisonHelper;
@@ -69,6 +73,10 @@
 use PHPStan\Rules\Methods\MissingMethodSelfOutTypeRule;
 use PHPStan\Rules\Methods\OverridingMethodRule;
 use PHPStan\Rules\MissingTypehintCheck;
+use PHPStan\Rules\PhpDoc\AssertRuleHelper;
+use PHPStan\Rules\PhpDoc\ConditionalReturnTypeRuleHelper;
+use PHPStan\Rules\PhpDoc\FunctionAssertRule;
+use PHPStan\Rules\PhpDoc\FunctionConditionalReturnTypeRule;
 use PHPStan\Rules\PhpDoc\GenericCallableRuleHelper;
 use PHPStan\Rules\PhpDoc\IncompatibleClassConstantPhpDocTypeRule;
 use PHPStan\Rules\PhpDoc\IncompatibleParamImmediatelyInvokedCallableRule;
@@ -78,6 +86,8 @@
 use PHPStan\Rules\PhpDoc\InvalidPhpDocTagValueRule;
 use PHPStan\Rules\PhpDoc\InvalidPHPStanDocTagRule;
 use PHPStan\Rules\PhpDoc\InvalidThrowsPhpDocValueRule;
+use PHPStan\Rules\PhpDoc\MethodAssertRule;
+use PHPStan\Rules\PhpDoc\MethodConditionalReturnTypeRule;
 use PHPStan\Rules\PhpDoc\UnresolvableTypeHelper;
 use PHPStan\Rules\Properties\ExistingClassesInPropertiesRule;
 use PHPStan\Rules\Properties\MissingPropertyTypehintRule;
@@ -186,6 +196,8 @@ private function getRuleRegistry(Container $container): RuleRegistry
 		$propertyTagCheck = new PropertyTagCheck($reflectionProvider, $classNameCheck, $genericObjectTypeCheck, $missingTypehintCheck, $unresolvableTypeHelper, true, true);
 		$reflector = $container->getService('stubReflector');
 		$relativePathHelper = $container->getService('simpleRelativePathHelper');
+		$assertRuleHelper = $container->getByType(AssertRuleHelper::class);
+		$conditionalReturnTypeRuleHelper = $container->getByType(ConditionalReturnTypeRuleHelper::class);
 
 		$rules = [
 			// level 0
@@ -237,6 +249,14 @@ private function getRuleRegistry(Container $container): RuleRegistry
 			new PropertyTagRule($propertyTagCheck),
 			new PropertyTagTraitRule($propertyTagCheck, $reflectionProvider),
 			new PropertyTagTraitUseRule($propertyTagCheck),
+			new EnumAncestorsRule($genericAncestorsCheck, $crossCheckInterfacesHelper),
+			new EnumTemplateTypeRule(),
+			new PropertyVarianceRule($varianceCheck),
+			new UsedTraitsRule($fileTypeMapper, $genericAncestorsCheck),
+			new FunctionAssertRule($assertRuleHelper),
+			new MethodAssertRule($assertRuleHelper),
+			new FunctionConditionalReturnTypeRule($conditionalReturnTypeRuleHelper),
+			new MethodConditionalReturnTypeRule($conditionalReturnTypeRuleHelper),
 
 			// level 6
 			new MissingFunctionParameterTypehintRule($missingTypehintCheck),
diff --git a/stubs/ReflectionClass.stub b/stubs/ReflectionClass.stub
index f47d5d89a1..3f6ce4bddf 100644
--- a/stubs/ReflectionClass.stub
+++ b/stubs/ReflectionClass.stub
@@ -6,11 +6,6 @@
 class ReflectionClass
 {
 
-	/**
-	 * @var class-string<T>
-	 */
-	public $name;
-
 	/**
 	 * @param T|class-string<T> $argument
 	 * @throws ReflectionException
diff --git a/stubs/ext-ds.stub b/stubs/ext-ds.stub
index ba72a0d584..f0b45a47b7 100644
--- a/stubs/ext-ds.stub
+++ b/stubs/ext-ds.stub
@@ -353,16 +353,6 @@ final class Map implements Collection, ArrayAccess
  */
 final class Pair implements JsonSerializable
 {
-	/**
-	 * @var TKey
-	 */
-	public $key;
-
-	/**
-	 * @var TValue
-	 */
-	public $value;
-
 	/**
 	 * @param TKey $key
 	 * @param TValue $value