Merge branch '13.2'

* 13.2:
  Closes #6744

Author: sebastianbergmann

src/Framework/Attributes/RequiresEnvironmentVariable.php

@@ -23,15 +23,10 @@
      * @var non-empty-string
      */
     private string $environmentVariableName;
-
-    /**
-     * @var ?non-empty-string
-     */
     private null|string $value;
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public function __construct(string $environmentVariableName, null|string $value = null)
     {
@@ -47,9 +42,6 @@ public function environmentVariableName(): string
         return $this->environmentVariableName;
     }
 
-    /**
-     * @return ?non-empty-string
-     */
     public function value(): null|string
     {
         return $this->value;

src/Framework/Attributes/WithEnvironmentVariable.php

@@ -24,14 +24,10 @@
      */
     private string $environmentVariableName;
 
-    /**
-     * @var ?non-empty-string
-     */
     private null|string $value;
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public function __construct(string $environmentVariableName, null|string $value = null)
     {
@@ -47,9 +43,6 @@ public function environmentVariableName(): string
         return $this->environmentVariableName;
     }
 
-    /**
-     * @return ?non-empty-string
-     */
     public function value(): null|string
     {
         return $this->value;

src/Metadata/Metadata.php

@@ -440,35 +440,31 @@ public static function requiresPhpunitExtensionOnMethod(string $extensionClass):
     }
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public static function requiresEnvironmentVariableOnClass(string $environmentVariableName, null|string $value): RequiresEnvironmentVariable
     {
         return new RequiresEnvironmentVariable(Level::CLASS_LEVEL, $environmentVariableName, $value);
     }
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public static function requiresEnvironmentVariableOnMethod(string $environmentVariableName, null|string $value): RequiresEnvironmentVariable
     {
         return new RequiresEnvironmentVariable(Level::METHOD_LEVEL, $environmentVariableName, $value);
     }
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public static function withEnvironmentVariableOnClass(string $environmentVariableName, null|string $value): WithEnvironmentVariable
     {
         return new WithEnvironmentVariable(Level::CLASS_LEVEL, $environmentVariableName, $value);
     }
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     public static function withEnvironmentVariableOnMethod(string $environmentVariableName, null|string $value): WithEnvironmentVariable
     {

src/Metadata/RequiresEnvironmentVariable.php

@@ -20,15 +20,10 @@
      * @var non-empty-string
      */
     private string $environmentVariableName;
-
-    /**
-     * @var ?non-empty-string
-     */
     private null|string $value;
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     protected function __construct(Level $level, string $environmentVariableName, null|string $value)
     {
@@ -51,9 +46,6 @@ public function environmentVariableName(): string
         return $this->environmentVariableName;
     }
 
-    /**
-     * @return ?non-empty-string
-     */
     public function value(): null|string
     {
         return $this->value;

src/Metadata/WithEnvironmentVariable.php

@@ -21,14 +21,10 @@
      */
     private string $environmentVariableName;
 
-    /**
-     * @var ?non-empty-string
-     */
     private null|string $value;
 
     /**
-     * @param non-empty-string  $environmentVariableName
-     * @param ?non-empty-string $value
+     * @param non-empty-string $environmentVariableName
      */
     protected function __construct(Level $level, string $environmentVariableName, null|string $value)
     {
@@ -51,9 +47,6 @@ public function environmentVariableName(): string
         return $this->environmentVariableName;
     }
 
-    /**
-     * @return ?non-empty-string
-     */
     public function value(): null|string
     {
         return $this->value;

tests/end-to-end/regression/6744.phpt

@@ -0,0 +1,20 @@
+--TEST--
+#6744: WithEnvironmentVariable supports setting an environment variable to an empty string
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6744/Issue6744Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 2 assertions)

tests/end-to-end/regression/6744/Issue6744Test.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture;
+
+use function getenv;
+use PHPUnit\Framework\Attributes\WithEnvironmentVariable;
+use PHPUnit\Framework\TestCase;
+
+final class Issue6744Test extends TestCase
+{
+    #[WithEnvironmentVariable('FOO', '')]
+    public function testEnvironmentVariableCanBeSetToEmptyString(): void
+    {
+        $this->assertSame('', $_ENV['FOO']);
+        $this->assertSame('', getenv('FOO'));
+    }
+}