Remove RequireParenthesesForNestedTernaryRule

Author: ondrejmirtes

conf/config.level0.neon

@@ -54,7 +54,6 @@ rules:
 	- PHPStan\Rules\Properties\AccessPropertiesInAssignRule
 	- PHPStan\Rules\Properties\AccessStaticPropertiesInAssignRule
 	- PHPStan\Rules\Properties\PropertyAttributesRule
-	- PHPStan\Rules\Ternary\RequireParenthesesForNestedTernaryRule
 	- PHPStan\Rules\Variables\UnsetRule
 
 services:

conf/config.neon

@@ -516,9 +516,6 @@ services:
 	-
 		class: PHPStan\Parser\FunctionCallStatementFinder
 
-	-
-		class: PHPStan\Parser\NodeChildrenVisitor
-
 	-
 		class: PHPStan\Process\CpuCoreCounter
 
@@ -1177,7 +1174,6 @@ services:
 		class: PHPStan\Parser\RichParser
 		arguments:
 			parser: @currentPhpVersionPhpParser
-			lexer: @currentPhpVersionLexer
 		autowired: no
 
 	currentPhpVersionSimpleParser:

src/Parser/NodeChildrenVisitor.php

@@ -3,48 +3,34 @@
 namespace PHPStan\Parser;
 
 use PhpParser\ErrorHandler\Collecting;
-use PhpParser\Lexer;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\NodeVisitor\NodeConnectingVisitor;
 use PHPStan\File\FileReader;
 use PHPStan\NodeVisitor\StatementOrderVisitor;
-use PHPStan\Php\PhpVersion;
 
 class RichParser implements Parser
 {
 
 	private \PhpParser\Parser $parser;
 
-	private Lexer $lexer;
-
 	private NameResolver $nameResolver;
 
 	private NodeConnectingVisitor $nodeConnectingVisitor;
 
 	private StatementOrderVisitor $statementOrderVisitor;
 
-	private NodeChildrenVisitor $nodeChildrenVisitor;
-
-	private PhpVersion $phpVersion;
-
 	public function __construct(
 		\PhpParser\Parser $parser,
-		Lexer $lexer,
 		NameResolver $nameResolver,
 		NodeConnectingVisitor $nodeConnectingVisitor,
-		StatementOrderVisitor $statementOrderVisitor,
-		NodeChildrenVisitor $nodeChildrenVisitor,
-		PhpVersion $phpVersion
+		StatementOrderVisitor $statementOrderVisitor
 	)
 	{
 		$this->parser = $parser;
-		$this->lexer = $lexer;
 		$this->nameResolver = $nameResolver;
 		$this->nodeConnectingVisitor = $nodeConnectingVisitor;
 		$this->statementOrderVisitor = $statementOrderVisitor;
-		$this->nodeChildrenVisitor = $nodeChildrenVisitor;
-		$this->phpVersion = $phpVersion;
 	}
 
 	/**
@@ -68,7 +54,6 @@ public function parseString(string $sourceCode): array
 	{
 		$errorHandler = new Collecting();
 		$nodes = $this->parser->parse($sourceCode, $errorHandler);
-		$tokens = $this->lexer->getTokens();
 		if ($errorHandler->hasErrors()) {
 			throw new \PHPStan\Parser\ParserErrorsException($errorHandler->getErrors(), null);
 		}
@@ -81,22 +66,8 @@ public function parseString(string $sourceCode): array
 		$nodeTraverser->addVisitor($this->nodeConnectingVisitor);
 		$nodeTraverser->addVisitor($this->statementOrderVisitor);
 
-		if ($this->phpVersion->requiresParenthesesForNestedTernaries()) {
-			$nodeTraverser->addVisitor($this->nodeChildrenVisitor);
-		}
-
-		/** @var array<\PhpParser\Node\Stmt> */
-		$nodes = $nodeTraverser->traverse($nodes);
-
-		if (!$this->phpVersion->requiresParenthesesForNestedTernaries()) {
-			return $nodes;
-		}
-
-		$tokensTraverser = new NodeTraverser();
-		$tokensTraverser->addVisitor(new NodeTokensVisitor($tokens));
-
 		/** @var array<\PhpParser\Node\Stmt> */
-		return $tokensTraverser->traverse($nodes);
+		return $nodeTraverser->traverse($nodes);
 	}
 
 }

src/Parser/NodeTokensVisitor.php

@@ -56,11 +56,6 @@ public function supportsLessOverridenParametersWithVariadic(): bool
 		return $this->versionId >= 80000;
 	}
 
-	public function requiresParenthesesForNestedTernaries(): bool
-	{
-		return $this->versionId >= 80000;
-	}
-
 	public function supportsThrowExpression(): bool
 	{
 		return $this->versionId >= 80000;

src/Parser/RichParser.php

@@ -10,7 +10,6 @@
 use PHPStan\Dependency\ExportedNodeResolver;
 use PHPStan\File\RelativePathHelper;
 use PHPStan\NodeVisitor\StatementOrderVisitor;
-use PHPStan\Parser\NodeChildrenVisitor;
 use PHPStan\Parser\RichParser;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\PhpDocInheritanceResolver;
@@ -523,12 +522,9 @@ private function createAnalyser(bool $reportUnmatchedIgnoredErrors): \PHPStan\An
 			$nodeScopeResolver,
 			new RichParser(
 				new \PhpParser\Parser\Php7($lexer),
-				$lexer,
 				new \PhpParser\NodeVisitor\NameResolver(),
 				new NodeConnectingVisitor(),
-				new StatementOrderVisitor(),
-				new NodeChildrenVisitor(),
-				self::getContainer()->getByType(PhpVersion::class)
+				new StatementOrderVisitor()
 			),
 			new DependencyResolver($fileHelper, $broker, new ExportedNodeResolver($fileTypeMapper, $printer)),
 			$reportUnmatchedIgnoredErrors