Fix possible parsing error + upgrade to PHPUnit 10.1.

niconoe- · niconoe- · commit fd04aec3d6e6 · 2023-04-20T15:19:28.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.0.0-rc3] - 2023-04-17
+
+### Fixed
+- Fatal error when analyzing snippets like `$a->{$b}` or `$a->{<some_expression>}`.
+- Fatal error when analyzing snippets like `$a->{$b}()` or `$a->{<some_expression>}()`.
+
+### Updates
+- Update to PHPUnit 10.1
+
 ## [3.0.0-rc2] - 2023-04-17
 
 ### New features
diff --git a/composer.json b/composer.json
@@ -33,12 +33,12 @@
     },
     "require-dev": {
         "phake/phake": "^4.4.0",
-        "phpstan/extension-installer": "^1.2",
+        "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-strict-rules": "^1.5",
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^10.1",
         "sebastian/comparator": ">=5.0.0",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/dom-crawler": "^6.2",
diff --git a/qa/phpunit.xml.dist b/qa/phpunit.xml.dist
@@ -24,11 +24,12 @@
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source>
         <include>
             <directory suffix=".php">../src</directory>
         </include>
-
+    </source>
+    <coverage>
         <report>
             <html outputDirectory="reports/phpunit/coverage-html/"/>
             <xml outputDirectory="reports/phpunit/coverage-xml/"/>
diff --git a/src/Hal/Component/File/Reader.php b/src/Hal/Component/File/Reader.php
@@ -55,7 +55,6 @@ public function readJson(string $path): mixed
     /**
      * {@inheritDoc}
      * @throws JsonException
-     * @codeCoverageIgnore Cannot be tested as file_get_contents is calling a URI, and we cannot fake its results.
      * @infection-ignore-all Cannot be tested as file_get_contents is calling a URI, and we cannot fake its results.
      */
     public function httpReadJson(string $uri): stdClass
diff --git a/src/Hal/DependencyInjection/DependencyInjectionProcessor.php b/src/Hal/DependencyInjection/DependencyInjectionProcessor.php
@@ -62,7 +62,6 @@
  * This class is the technical entrypoint and thus, can't be unit tested.
  * The behavior of this class is tested via functional tests.
  *
- * @codeCoverageIgnore Technical class that can only be tested functionally.
  * @infection-ignore-all Technical class that can only be tested functionally.
  */
 final class DependencyInjectionProcessor
diff --git a/src/Hal/Metric/Class_/Structural/LcomVisitor.php b/src/Hal/Metric/Class_/Structural/LcomVisitor.php
@@ -14,9 +14,11 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 use PhpParser\NodeVisitorAbstract;
+use Stringable;
 use function array_filter;
 use function array_map;
 use function in_array;
+use function is_string;
 use function property_exists;
 
 /**
@@ -198,6 +200,8 @@ private function getPropertyFetchTreeNodes(Node $node): array
             && property_exists($node->var, 'name')
             && !($node->var->name instanceof Node\Expr\Variable) // Prevents failure when $a->$b.
             && 'this' === (string)$node->var->name
+            // Prevents failures when $a->{$name} or $a->{<expr>}
+            && (is_string($node->name) || $node->name instanceof Stringable)
         ) {
             return [$this->graph->gather((string)$node->name)];
         }
@@ -219,6 +223,8 @@ private function getMethodCallTreeNodes(Node $node): array
             && property_exists($node->var, 'name')
             && !($node->var->name instanceof Node\Expr\Variable) // Prevents failure when $a->$b(), or $c().
             && 'this' === (string)$node->var->name
+            // Prevents failures when $a->{$name}() or $a->{<expr>}()
+            && (is_string($node->name) || $node->name instanceof Stringable)
         ) {
             return [$this->graph->gather($node->name . '()')];
         }
diff --git a/tests/Component/File/ReaderTest.php b/tests/Component/File/ReaderTest.php
@@ -5,11 +5,14 @@
 
 use Hal\Component\File\Reader;
 use JsonException;
+use PHPUnit\Framework\Attributes\IgnoreMethodForCodeCoverage;
 use PHPUnit\Framework\TestCase;
 use function chmod;
 use function file_put_contents;
 use function touch;
 
+// Cannot be tested as file_get_contents is calling a URI, and we cannot fake its results.
+#[IgnoreMethodForCodeCoverage(Reader::class, 'httpReadJson')]
 final class ReaderTest extends TestCase
 {
     use TraitTestSystem;
diff --git a/tests/DependencyInjection/DependencyInjectionProcessorTest.php b/tests/DependencyInjection/DependencyInjectionProcessorTest.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests\Hal\DependencyInjection;
+
+use Hal\DependencyInjection\DependencyInjectionProcessor;
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
+use PHPUnit\Framework\Attributes\IgnoreClassForCodeCoverage;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Ignores DependencyInjectionProcessor::class because this is a technical class that can only be tested functionally.
+ */
+#[DoesNotPerformAssertions]
+#[IgnoreClassForCodeCoverage(DependencyInjectionProcessor::class)]
+final class DependencyInjectionProcessorTest extends TestCase
+{
+    public function test(): void
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,6 @@`
`62`	`62`	`* This class is the technical entrypoint and thus, can't be unit tested.`
`63`	`63`	`* The behavior of this class is tested via functional tests.`
`64`	`64`	`*`
`65`		`- * @codeCoverageIgnore Technical class that can only be tested functionally.`
`66`	`65`	`* @infection-ignore-all Technical class that can only be tested functionally.`
`67`	`66`	`*/`
`68`	`67`	`final class DependencyInjectionProcessor`