Merge pull request #515 from phpmetrics/update/3.x-qa

Make sure OpenMetrics format is available and upgrade QA.

Author: niconoe-

composer.json

@@ -29,21 +29,22 @@
     "require": {
         "php": ">=8.1",
         "ext-tokenizer": "*",
-        "nikic/php-parser": "^5.0"
+        "nikic/php-parser": "^5.4",
+        "openmetrics-php/exposition-text": "^0.4.1"
     },
     "require-dev": {
-        "openmetrics-php/exposition-text": "^0.4.1",
-        "phake/phake": "^4.4.0",
-        "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",
+        "phake/phake": "^4.5.3",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.5",
         "sebastian/comparator": ">=5.0.0",
-        "squizlabs/php_codesniffer": "^3.8",
+        "squizlabs/php_codesniffer": "^3.11",
         "symfony/dom-crawler": "^6.4",
-        "roave/security-advisories": "dev-latest"
+        "roave/security-advisories": "dev-latest",
+        "vimeo/psalm": "^6.2"
     },
     "bin": [
         "bin/phpmetrics"
@@ -57,7 +58,6 @@
     },
     "suggest": {
         "ext-dom": "To allow XML parsing and report results.",
-        "ext-yaml": "To allow yaml parsing of configuration files.",
-        "openmetrics-php/exposition-text": "To allow OpenMetrics report."
+        "ext-yaml": "To allow yaml parsing of configuration files."
     }
 }

qa/Dockerfile

@@ -1,6 +1,6 @@
 FROM php:8.1-alpine
 
-ENV COMPOSER_VENDOR_DIR=vendor COMPOSER_CACHE_DIR=/tmp/.composer COMPOSER_ALLOW_SUPERUSER=1
+ENV COMPOSER_VENDOR_DIR=vendor COMPOSER_CACHE_DIR=/tmp/.composer COMPOSER_ALLOW_SUPERUSER=1 COMPOSER_ROOT_VERSION=3.0.0
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
@@ -35,10 +35,10 @@ RUN apk update && \
     # Allow phar writing.
     echo 'phar.readonly=0' >> ${PHP_INI_DIR}/conf.d/docker-php-phar-readonly.ini && \
     # Fetching the PHP Infection from release to fetch.
-    echo "Looking for the latest PHP Infection 0.26.x version…" && \
-    RELEASES=$(curl -sS https://api.github.com/repos/infection/infection/releases | jq --compact-output --raw-output 'map(select( .tag_name | test("^0.26.[0-9]+$") ))') && \
+    echo "Looking for the latest PHP Infection 0.29.x version…" && \
+    RELEASES=$(curl -sS https://api.github.com/repos/infection/infection/releases | jq --compact-output --raw-output 'map(select( .tag_name | test("^0.29.[0-9]+$") ))') && \
     NB_RELEASES=$(echo "${RELEASES}" | jq --compact-output --raw-output 'length') && \
-    if [ "${NB_RELEASES}" == "0" ]; then echo "ERROR: Not a single patch version found for minor version 0.26 of PHP Infection."; exit 1; fi && \
+    if [ "${NB_RELEASES}" == "0" ]; then echo "ERROR: Not a single patch version found for minor version 0.29 of PHP Infection."; exit 1; fi && \
     LATEST_FOR_MINOR=$(echo "${RELEASES}" | jq --compact-output --raw-output '. | max_by( .tag_name | split(".") | map(tonumber) ) | {tag: .tag_name, src: .assets[]|select(.name == "infection.phar").browser_download_url}') && \
     INFECTION_TAG=$(echo "${LATEST_FOR_MINOR}" | jq --compact-output --raw-output '.tag') && \
     URL_SRC=$(echo "${LATEST_FOR_MINOR}" | jq --compact-output --raw-output '.src') && \

qa/phpstan.neon.dist

@@ -5,5 +5,3 @@ parameters:
     tmpDir: /opt/project/qa/cache/phpstan
     paths:
         - ../src
-    featureToggles:
-        disableRuntimeReflectionProvider: true

qa/psalm-baseline.xml

@@ -13,17 +13,6 @@
       <code>stdClass</code>
     </MoreSpecificReturnType>
   </file>
-  <file src="../src/Hal/Component/Tree/Edge.php">
-    <ImplicitToStringCast>
-      <code><![CDATA[$this->from]]></code>
-      <code><![CDATA[$this->to]]></code>
-    </ImplicitToStringCast>
-  </file>
-  <file src="../src/Hal/Component/Tree/Graph.php">
-    <ImplicitToStringCast>
-      <code>$edge</code>
-    </ImplicitToStringCast>
-  </file>
   <file src="../src/Hal/Metric/BagTrait.php">
     <LessSpecificImplementedReturnType>
       <code>array</code>
@@ -46,15 +35,26 @@
     </PropertyTypeCoercion>
   </file>
   <file src="../src/Hal/Metric/Class_/Coupling/ExternalsVisitor.php">
+    <PossiblyUndefinedArrayOffset>
+      <code><![CDATA[$resolvedClassName]]></code>
+    </PossiblyUndefinedArrayOffset>
     <UndefinedPropertyFetch>
       <code><![CDATA[$node->class]]></code>
     </UndefinedPropertyFetch>
   </file>
   <file src="../src/Hal/Metric/Class_/Structural/LcomVisitor.php">
+    <DocblockTypeContradiction>
+      <code><![CDATA[isset($node->name)]]></code>
+    </DocblockTypeContradiction>
     <UndefinedPropertyFetch>
       <code><![CDATA[$node->var->name]]></code>
     </UndefinedPropertyFetch>
   </file>
+  <file src="../src/Hal/Metric/Class_/Structural/SystemComplexityVisitor.php">
+    <InvalidOperand>
+      <code><![CDATA[null !== $node->expr]]></code>
+    </InvalidOperand>
+  </file>
   <file src="../src/Hal/Metric/Class_/Text/HalsteadVisitor.php">
     <UndefinedPropertyFetch>
       <code><![CDATA[$node->name]]></code>
@@ -66,6 +66,11 @@
       <code><![CDATA[$node->value]]></code>
     </UndefinedPropertyFetch>
   </file>
+  <file src="../src/Hal/Metric/Class_/Text/LengthVisitor.php">
+    <InvalidOperand>
+      <code><![CDATA[null !== $commentedCode]]></code>
+    </InvalidOperand>
+  </file>
   <file src="../src/Hal/Metric/Consolidated.php">
     <PropertyTypeCoercion>
       <code>$avg</code>
@@ -85,6 +90,11 @@
       <code><![CDATA[$edge->getTo()->getKey() === $node->getKey()]]></code>
     </InvalidOperand>
   </file>
+  <file src="../src/Hal/Metric/System/Packages/Composer/Composer.php">
+    <ReferenceConstraintViolation>
+      <code>$packageVersion</code>
+    </ReferenceConstraintViolation>
+  </file>
   <file src="../src/Hal/Metric/System/Packages/Composer/Packagist.php">
     <LessSpecificReturnStatement>
       <code>(object)$response</code>

src/Hal/Exception/NotInstalledOpenMetricsPhpExpositionTextException.php

@@ -13,6 +13,7 @@
 use PhpParser\NodeVisitorAbstract;
 use Stringable;
 use function array_map;
+use function explode;
 use function in_array;
 use function ltrim;
 use function preg_match_all;
@@ -236,8 +237,9 @@ private function resolveClassName(string $classNameToResolve): null|string
             if ($useAlias === $classNameToResolve && !str_contains($classNameToResolve, '\\')) {
                 return (string)$use->name;
             }
-            if ($useAlias === strstr($classNameToResolve, '\\', true)) {
-                return $use->name . strstr($classNameToResolve, '\\');
+            [$resolvedAlias, $resolvedClassName] = explode('\\', $classNameToResolve, 2);
+            if ($useAlias === $resolvedAlias) {
+                return $use->name . '\\' . $resolvedClassName;
             }
         }
 

src/Hal/Metric/Class_/Coupling/ExternalsVisitor.php

@@ -67,7 +67,7 @@ public function get(string $package): stdClass
         $latest = '0.0.0';
 
         foreach ((array)$json->package->versions as $version => $packageDataAtSpecificVersion) {
-            $version = ltrim((string) $version, 'v');
+            $version = ltrim((string)$version, 'v');
             if (0 === preg_match('#^(\d|\.)+$#', $version) || version_compare($version, $latest, '<')) {
                 continue;
             }

src/Hal/Metric/System/Packages/Composer/Packagist.php

@@ -5,13 +5,15 @@
 
 use Hal\Application\Config\ConfigBagInterface;
 use Hal\Component\File\WriterInterface;
-use Hal\Exception\NotInstalledOpenMetricsPhpExpositionTextException;
 use Hal\Exception\NotWritableOpenMetricsReportException;
 use Hal\Report\SummaryProvider;
 use OpenMetricsPhp\Exposition\Text\Collections\GaugeCollection;
 use OpenMetricsPhp\Exposition\Text\Metrics\Gauge;
 use OpenMetricsPhp\Exposition\Text\Types\MetricName;
 
+use function dirname;
+use function implode;
+
 /**
  * Dedicated writer that defines the content to write in a file when exporting the OpenMetrics summary of the metrics.
  */
@@ -31,10 +33,6 @@ public function __construct(
      */
     public function getReport(): string
     {
-        if (!class_exists(GaugeCollection::class)) {
-            throw NotInstalledOpenMetricsPhpExpositionTextException::notInstalled();
-        }
-
         $reportMetrics = [
             // LOC
             'lines_of_code' => [$this->sum->loc, 'Lines of code'],

src/Hal/Report/OpenMetrics/SummaryWriter.php

@@ -105,7 +105,11 @@ public function testGlob(string $pattern, array|false $expectedContent): void
 
     public static function tearDownAfterClass(): void
     {
-        self::rm(self::getAbsoluteRandomFolderPath());
+        $path = self::getAbsoluteRandomFolderPath();
+        // Reset permissions on specific folder to be able to remove it.
+        chmod($path . '/providerExists/subfolder', 0o777);
+
+        self::rm($path);
         parent::tearDownAfterClass();
     }
 }