Clean up parameters config

phpstan · Aug 5, 2024 · caa046b · caa046b
1 parent 0c7771b
commit caa046b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/extension.neon b/extension.neon
@@ -1,5 +1,8 @@
 parameters:
 	doctrine:
+		reportDynamicQueryBuilders: false
+		reportUnknownTypes: false
+		allowNullablePropertyForRequiredField: false
 		repositoryClass: null
 		ormRepositoryClass: null
 		odmRepositoryClass: null
@@ -8,6 +11,7 @@ parameters:
 		objectManagerLoader: null
 		searchOtherMethodsForQueryBuilderBeginning: true
 		queryBuilderFastAlgorithm: false
+		literalString: false
 	featureToggles:
 		skipCheckGenericClasses:
 			- Doctrine\ODM\MongoDB\Mapping\ClassMetadata
@@ -75,6 +79,10 @@ parametersSchema:
 		objectManagerLoader: schema(string(), nullable())
 		searchOtherMethodsForQueryBuilderBeginning: bool()
 		queryBuilderFastAlgorithm: bool()
+		reportDynamicQueryBuilders: bool()
+		reportUnknownTypes: bool()
+		allowNullablePropertyForRequiredField: bool()
+		literalString: bool()
 	])
 
 conditionalTags:
@@ -435,7 +443,7 @@ services:
 	-
 		class: PHPStan\PhpDoc\Doctrine\DoctrineLiteralStringTypeNodeResolverExtension
 		arguments:
-			bleedingEdge: %featureToggles.bleedingEdge%
+			enabled: %doctrine.literalString%
 		tags:
 			- phpstan.phpDoc.typeNodeResolverExtension
 

diff --git a/rules.neon b/rules.neon
@@ -17,6 +17,7 @@ parametersSchema:
 		reportDynamicQueryBuilders: bool()
 		reportUnknownTypes: bool()
 		allowNullablePropertyForRequiredField: bool()
+		literalString: bool()
 	])
 
 rules:

diff --git a/src/PhpDoc/Doctrine/DoctrineLiteralStringTypeNodeResolverExtension.php b/src/PhpDoc/Doctrine/DoctrineLiteralStringTypeNodeResolverExtension.php
@@ -15,11 +15,11 @@ class DoctrineLiteralStringTypeNodeResolverExtension implements TypeNodeResolver
 {
 
 	/** @var bool */
-	private $bleedingEdge;
+	private $enabled;
 
-	public function __construct(bool $bleedingEdge)
+	public function __construct(bool $enabled)
 	{
-		$this->bleedingEdge = $bleedingEdge;
+		$this->enabled = $enabled;
 	}
 
 	public function resolve(TypeNode $typeNode, NameScope $nameScope): ?Type
@@ -32,7 +32,7 @@ public function resolve(TypeNode $typeNode, NameScope $nameScope): ?Type
 			return null;
 		}
 
-		if ($this->bleedingEdge) {
+		if ($this->enabled) {
 			return new IntersectionType([
 				new StringType(),
 				new AccessoryLiteralStringType(),