Fix auditor errors

Author: a-menshchikov

.github/workflows/audit.yml

@@ -7,7 +7,7 @@ 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:
@@ -54,13 +54,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

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

@@ -6,9 +6,11 @@ parameters:
   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

psalm.xml

@@ -23,18 +23,6 @@
                 <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

@@ -26,6 +26,7 @@ public function __construct(array $delimiterMap)
         $this->delimiterMap = $delimiterMap;
     }
 
+    #[\Override]
     public static function getProvidedTypes(): array
     {
         // NB
@@ -36,6 +37,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 +51,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 ? '' : '\\');
     }
 }

src/DependencyInjection/NbgroupEnvExtension.php

@@ -20,11 +20,14 @@ class NbgroupEnvExtension extends Extension
 {
     private const NB_REPLACEMENT_MARK = '// NB';
 
+    #[\Override]
     public function getConfiguration(array $config, ContainerBuilder $container): Configuration
     {
         return new Configuration();
     }
 
+    /** @psalm-suppress MixedArrayAccess, MixedArgument */
+    #[\Override]
     public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();

tests/ArrayCastEnvVarProcessorTest.php

@@ -29,7 +29,7 @@ public function testSuccess(string $prefix, array $envValue, array $expected): v
     /**
      * @return \Generator<array{string, array, array}>
      */
-    public function provideSuccessCases(): iterable
+    public static function provideSuccessCases(): iterable
     {
         yield 'bool-array' => [
             'bool-array',
@@ -82,15 +82,15 @@ public function testInvalidNumeric(string $prefix, array $envValue, string $expe
         $processor = new ArrayCastEnvVarProcessor();
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage(sprintf($expectedMessageFormat, 'DM'));
+        $this->expectExceptionMessage(\sprintf($expectedMessageFormat, 'DM'));
 
         $processor->getEnv($prefix, 'DM', static fn (): array => $envValue);
     }
 
     /**
      * @return \Generator<array{string, array, string}>
      */
-    public function provideInvalidNumericCases(): iterable
+    public static function provideInvalidNumericCases(): iterable
     {
         yield [
             'int-array',
@@ -113,15 +113,15 @@ public function testInvalidBase64(string $prefix, array $envValue, string $expec
         $processor = new ArrayCastEnvVarProcessor();
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage(sprintf($expectedMessageFormat, 'DM'));
+        $this->expectExceptionMessage(\sprintf($expectedMessageFormat, 'DM'));
 
         $processor->getEnv($prefix, 'DM', static fn (): array => $envValue);
     }
 
     /**
      * @return \Generator<array{string, array, string}>
      */
-    public function provideInvalidBase64Cases(): iterable
+    public static function provideInvalidBase64Cases(): iterable
     {
         yield [
             'base64-array',

tests/DependencyInjection/ConfigurationTest.php

@@ -20,6 +20,11 @@ final class ConfigurationTest extends TestCase
     /** @var Processor */
     private $processor;
 
+    protected function setUp(): void
+    {
+        $this->processor = new Processor();
+    }
+
     /**
      * @dataProvider provideValidConfigCases
      */
@@ -31,7 +36,7 @@ public function testValidConfig(array $config, array $expected, string $descript
     /**
      * @return \Generator<array{array, array, string}>
      */
-    public function provideValidConfigCases(): iterable
+    public static function provideValidConfigCases(): iterable
     {
         yield [
             [],
@@ -117,7 +122,7 @@ public function testInvalidConfig(array $config, string $expectedMessage): void
     /**
      * @return \Generator<array{array, string}>
      */
-    public function provideInvalidConfigCases(): iterable
+    public static function provideInvalidConfigCases(): iterable
     {
         yield [
             [
@@ -135,9 +140,4 @@ public function provideInvalidConfigCases(): iterable
             'Delimiter should be one character only.',
         ];
     }
-
-    protected function setUp(): void
-    {
-        $this->processor = new Processor();
-    }
 }