Merge pull request #16 from a-menshchikov/3.x

Fix auditor errors

Author: a-menshchikov

.github/workflows/audit.yml

@@ -7,22 +7,12 @@ jobs:
     name: Audit
     strategy:
       matrix:
-        php-version: [ '8.2', '8.3' ]
+        php-version: [ '8.2', '8.3', '8.4' ]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout (Push)
+      - name: Checkout
         uses: actions/checkout@v4
-        if: github.event_name == 'push'
-        with:
-          fetch-depth: 0
-
-      - name: Checkout (PR)
-        uses: actions/checkout@v4
-        if: github.event_name == 'pull_request'
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          fetch-depth: 0
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -54,13 +44,13 @@ jobs:
           echo "::endgroup::"
 
       - name: Auditor
-        uses: docker://nbgrp/auditor:0.23.1
+        uses: docker://nbgrp/auditor:0.29.0
 
       - name: Tests
         run: vendor/bin/simple-phpunit
 
       - name: Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./clover.xml

.php-cs-fixer.php

@@ -31,6 +31,9 @@
         ],
         'comment_to_phpdoc' => [
             'ignored_tags' => [
+                'codeCoverageIgnoreStart',
+                'codeCoverageIgnoreEnd',
+                'codeCoverageIgnore',
                 'phan-suppress-current-line',
                 'phan-suppress-next-line',
                 'see',

composer.json

@@ -24,6 +24,7 @@
         "symfony/http-kernel": "^7"
     },
     "require-dev": {
+        "phpunit/phpunit": "^11.5",
         "roave/security-advisories": "dev-latest",
         "symfony/phpunit-bridge": "^7"
     },

grumphp.yml

@@ -7,6 +7,9 @@ grumphp:
     enabled: false
 
   tasks:
+    composer:
+      strict: true
+
     composer_normalize:
       indent_size: 4
       indent_style: 'space'
@@ -32,4 +35,4 @@ grumphp:
       no_cache: true
       show_info: true
 
-    securitychecker_local: ~
+    securitychecker_composeraudit: ~

phpcs.xml

@@ -61,6 +61,7 @@
                 <element value="private methods" />
             </property>
         </properties>
+        <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
     <rule ref="SlevomatCodingStandard.Classes.MethodSpacing" />
     <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference" />
@@ -185,14 +186,17 @@
 
     <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
         <properties>
-            <property name="linesCountBeforeDeclare" value="0" />
+            <property name="linesCountBeforeDeclare" value="1" />
             <property name="linesCountAfterDeclare" value="1" />
             <property name="spacesCountAroundEqualsSign" value="0" />
         </properties>
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.DisallowArrayTypeHintSyntax">
         <properties>
-            <property name="traversableTypeHints" value="true" />
+            <property name="traversableTypeHints" type="array">
+                <element value="Traversable" />
+                <element value="\ArrayIterator" />
+            </property>
         </properties>
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue" />
@@ -204,9 +208,9 @@
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing" />
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
         <properties>
-            <property name="withSpaces" value="no" />
+            <property name="withSpacesAroundOperators" value="no" />
             <property name="shortNullable" value="yes" />
             <property name="nullPosition" value="last" />
         </properties>

phpstan.neon

@@ -3,12 +3,12 @@ parameters:
   paths:
     - src
     - tests
-  bootstrapFiles:
-    - vendor/bin/.phpunit/phpunit/vendor/autoload.php
-
-  checkMissingIterableValueType: false
 
   ignoreErrors:
     -
       message: '/Cannot cast mixed to (int|float|string)/'
       path: 'src/ArrayCastEnvVarProcessor.php'
+    -
+      identifier: missingType.iterableValue
+    -
+      identifier: phpDoc.parseError

phpunit.xml.dist

@@ -1,33 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
-        >
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true"
+>
 
     <php>
         <ini name="error_reporting" value="-1" />
-        <server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[indirect]=1" />
+        <server name="SYMFONY_PHPUNIT_VERSION" value="11.5" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[total]=13&amp;max[indirect]=6" />
     </php>
 
     <testsuites>
         <testsuite name="NbgroupEnvBundle Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true"
+    <source ignoreIndirectDeprecations="true"
+            restrictNotices="true"
+            restrictWarnings="true"
     >
         <include>
-            <directory suffix=".php">src</directory>
+            <directory>src</directory>
         </include>
-        <exclude>
-            <file>src/CsvEnvVarProcessor.php</file>
-            <file>src/NbgroupEnvBundle.php</file>
-        </exclude>
+    </source>
+
+    <coverage>
         <report>
             <clover outputFile="clover.xml" />
         </report>

psalm.xml

@@ -17,24 +17,12 @@
     </projectFiles>
 
     <issueHandlers>
-        <UndefinedClass>
-            <errorLevel type="suppress">
-                <directory name="tests" />
-                <file name=".php-cs-fixer.php" />
-            </errorLevel>
-        </UndefinedClass>
-
         <!-- PHPUnit -->
         <PropertyNotSetInConstructor>
             <errorLevel type="suppress">
                 <directory name="tests" />
             </errorLevel>
         </PropertyNotSetInConstructor>
-        <MissingDependency>
-            <errorLevel type="suppress">
-                <directory name="tests" />
-            </errorLevel>
-        </MissingDependency>
     </issueHandlers>
 
     <plugins>

src/ArrayCastEnvVarProcessor.php

@@ -10,6 +10,7 @@
 
 final class ArrayCastEnvVarProcessor implements EnvVarProcessorInterface
 {
+    #[\Override]
     public static function getProvidedTypes(): array
     {
         return [
@@ -27,6 +28,7 @@ public static function getProvidedTypes(): array
      *
      * @psalm-suppress MixedReturnTypeCoercion
      */
+    #[\Override]
     public function getEnv(string $prefix, string $name, \Closure $getEnv): array
     {
         $env = (array) $getEnv($name);
@@ -46,6 +48,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): array
      */
     private static function getBooleanMapper(): callable
     {
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         return static fn (mixed $value): bool => (bool) (filter_var($value, \FILTER_VALIDATE_BOOLEAN, ['flags' => \FILTER_NULL_ON_FAILURE]) ?? filter_var($value, \FILTER_VALIDATE_INT) ?: filter_var($value, \FILTER_VALIDATE_FLOAT));
     }
 
@@ -55,6 +58,7 @@ private static function getBooleanMapper(): callable
     private static function getIntegerMapper(string $name): callable
     {
         return static function (mixed $value) use ($name): int {
+            /** @psalm-suppress RiskyTruthyFalsyComparison */
             if ((filter_var($value, \FILTER_VALIDATE_INT) ?: filter_var($value, \FILTER_VALIDATE_FLOAT)) === false) {
                 throw new RuntimeException('Non-numeric member of environment variable "'.$name.'" cannot be cast to int.');
             }

src/CsvEnvVarProcessor.php

@@ -9,9 +9,11 @@
 use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
+// @codeCoverageIgnoreStart
 if (class_exists(CsvEnvVarProcessor::class, false)) {
     return;
 }
+// @codeCoverageIgnoreEnd
 
 final class CsvEnvVarProcessor implements EnvVarProcessorInterface
 {
@@ -26,6 +28,7 @@ public function __construct(array $delimiterMap)
         $this->delimiterMap = $delimiterMap;
     }
 
+    #[\Override]
     public static function getProvidedTypes(): array
     {
         // NB
@@ -36,6 +39,7 @@ public static function getProvidedTypes(): array
     /**
      * @return non-empty-list<string|null>
      */
+    #[\Override]
     public function getEnv(string $prefix, string $name, \Closure $getEnv): array
     {
         if (\array_key_exists($prefix, $this->delimiterMap) === false) {
@@ -49,6 +53,7 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv): array
             throw new RuntimeException('Environment variable "'.$name.'" should be a string.');
         }
 
+        // @phpstan-ignore greaterOrEqual.alwaysTrue
         return str_getcsv($env, $delimiter, '"', \PHP_VERSION_ID >= 70400 ? '' : '\\');
     }
 }