Fix tests

Author: a-menshchikov

.github/workflows/audit.yml

@@ -14,15 +14,12 @@ jobs:
       - name: Checkout (Push)
         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

.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"
     },

phpstan.neon

@@ -3,8 +3,6 @@ parameters:
   paths:
     - src
     - tests
-  bootstrapFiles:
-    - vendor/bin/.phpunit/phpunit/vendor/autoload.php
 
   ignoreErrors:
     -

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

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
 {

tests/ArrayCastEnvVarProcessorTest.php

@@ -6,19 +6,18 @@
 namespace Nbgrp\Tests\EnvBundle;
 
 use Nbgrp\EnvBundle\ArrayCastEnvVarProcessor;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
- * @covers \Nbgrp\EnvBundle\ArrayCastEnvVarProcessor
- *
  * @internal
  */
+#[CoversClass(ArrayCastEnvVarProcessor::class)]
 final class ArrayCastEnvVarProcessorTest extends TestCase
 {
-    /**
-     * @dataProvider provideSuccessCases
-     */
+    #[DataProvider('provideSuccessCases')]
     public function testSuccess(string $prefix, array $envValue, array $expected): void
     {
         $processor = new ArrayCastEnvVarProcessor();
@@ -74,9 +73,7 @@ public static function provideSuccessCases(): iterable
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidNumericCases
-     */
+    #[DataProvider('provideInvalidNumericCases')]
     public function testInvalidNumeric(string $prefix, array $envValue, string $expectedMessageFormat): void
     {
         $processor = new ArrayCastEnvVarProcessor();
@@ -105,9 +102,7 @@ public static function provideInvalidNumericCases(): iterable
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidBase64Cases
-     */
+    #[DataProvider('provideInvalidBase64Cases')]
     public function testInvalidBase64(string $prefix, array $envValue, string $expectedMessageFormat): void
     {
         $processor = new ArrayCastEnvVarProcessor();

tests/DependencyInjection/ConfigurationTest.php

@@ -6,28 +6,28 @@
 namespace Nbgrp\Tests\EnvBundle\DependencyInjection;
 
 use Nbgrp\EnvBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 
 /**
- * @covers \Nbgrp\EnvBundle\DependencyInjection\Configuration
- *
  * @internal
  */
+#[CoversClass(Configuration::class)]
 final class ConfigurationTest extends TestCase
 {
     /** @var Processor */
     private $processor;
 
+    #[\Override]
     protected function setUp(): void
     {
         $this->processor = new Processor();
     }
 
-    /**
-     * @dataProvider provideValidConfigCases
-     */
+    #[DataProvider('provideValidConfigCases')]
     public function testValidConfig(array $config, array $expected, string $description): void
     {
         self::assertSame($expected, $this->processor->processConfiguration(new Configuration(), [$config]), $description);
@@ -109,9 +109,7 @@ public static function provideValidConfigCases(): iterable
         ];
     }
 
-    /**
-     * @dataProvider provideInvalidConfigCases
-     */
+    #[DataProvider('provideInvalidConfigCases')]
     public function testInvalidConfig(array $config, string $expectedMessage): void
     {
         $this->expectException(InvalidConfigurationException::class);

tests/DependencyInjection/NbgroupEnvExtensionTest.php

@@ -5,15 +5,19 @@
 
 namespace Nbgrp\Tests\EnvBundle\DependencyInjection;
 
+use Nbgrp\EnvBundle\ArrayCastEnvVarProcessor;
+use Nbgrp\EnvBundle\DependencyInjection\Configuration;
 use Nbgrp\EnvBundle\DependencyInjection\NbgroupEnvExtension;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
- * @covers \Nbgrp\EnvBundle\DependencyInjection\NbgroupEnvExtension
- *
  * @internal
  */
+#[CoversClass(NbgroupEnvExtension::class)]
+#[CoversClass(ArrayCastEnvVarProcessor::class)]
+#[CoversClass(Configuration::class)]
 final class NbgroupEnvExtensionTest extends TestCase
 {
     public function testComplexUsage(): void