Bring all throw expr detection logic back into FeatureCollector

Author: ssnepenthe

src/FeatureCounter/Analyzer/FeatureCounterAnalyzer.php

@@ -12,7 +12,6 @@
 use Symfony\Component\Finder\SplFileInfo;
 use TomasVotruba\Lines\Exception\ShouldNotHappenException;
 use TomasVotruba\Lines\FeatureCounter\NodeVisitor\FeatureCollectorNodeVisitor;
-use TomasVotruba\Lines\FeatureCounter\NodeVisitor\ThrowExpressionFlaggingNodeVisitor;
 use TomasVotruba\Lines\FeatureCounter\ValueObject\FeatureCollector;
 
 /**
@@ -38,7 +37,7 @@ public function analyze(array $fileInfos): FeatureCollector
         $progressBar->start(count($fileInfos));
 
         $featureCollectorNodeVisitor = new FeatureCollectorNodeVisitor($this->featureCollector);
-        $nodeTraverser = new NodeTraverser(new ThrowExpressionFlaggingNodeVisitor(), $featureCollectorNodeVisitor);
+        $nodeTraverser = new NodeTraverser($featureCollectorNodeVisitor);
 
         foreach ($fileInfos as $fileInfo) {
             $stmts = $this->parser->parse($fileInfo->getContents());

src/FeatureCounter/NodeVisitor/ThrowExpressionFlaggingNodeVisitor.php

@@ -26,6 +26,7 @@
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Enum_;
+use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\UnionType;
 use TomasVotruba\Lines\FeatureCounter\Enum\PhpVersion;
@@ -211,7 +212,15 @@ function (Node $node): bool {
         $this->phpFeatures[] = new PhpFeature(
             PhpVersion::PHP_80,
             'Throw expression',
-            fn (Node $node): bool => $node instanceof Throw_ && $node->getAttribute('is_throw_expression', false) === true,
+            function (Node $node) {
+                if ($node instanceof Expression && $node->expr instanceof Throw_) {
+                    $node->expr->setAttribute('is_throw_statement', true);
+
+                    return false;
+                }
+
+                return $node instanceof Throw_ && $node->getAttribute('is_throw_statement', false) === false;
+            },
         );
 
         // enums