Merge branch '7.4' into 8.0

* 7.4:
  fix test on Windows
  simplify test
  Bump Symfony version to 7.4.0
  Update VERSION for 7.4.0-BETA2
  Update CHANGELOG for 7.4.0-BETA2

Author: xabbuh

Tests/Kernel/MicroKernelTraitTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Kernel;
 
+use PHPUnit\Framework\Attributes\BackupGlobals;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
@@ -46,47 +47,33 @@ protected function tearDown(): void
         }
     }
 
+    #[BackupGlobals(true)]
     public function testGetShareDirDisabledByEnv()
     {
-        $previous = $_SERVER['APP_SHARE_DIR'] ?? null;
         $_SERVER['APP_SHARE_DIR'] = 'false';
 
-        try {
-            $kernel = $this->kernel = new ConcreteMicroKernel('test', false);
+        $kernel = $this->kernel = new ConcreteMicroKernel('test', false);
 
-            $this->assertNull($kernel->getShareDir());
+        $this->assertNull($kernel->getShareDir());
 
-            $parameters = $kernel->getKernelParameters();
-            $this->assertArrayNotHasKey('kernel.share_dir', $parameters);
-        } finally {
-            if (null === $previous) {
-                unset($_SERVER['APP_SHARE_DIR']);
-            } else {
-                $_SERVER['APP_SHARE_DIR'] = $previous;
-            }
-        }
+        $parameters = $kernel->getKernelParameters();
+        $this->assertArrayNotHasKey('kernel.share_dir', $parameters);
     }
 
+    #[BackupGlobals(true)]
     public function testGetShareDirCustomPathFromEnv()
     {
-        $previous = $_SERVER['APP_SHARE_DIR'] ?? null;
         $_SERVER['APP_SHARE_DIR'] = sys_get_temp_dir();
 
-        try {
-            $kernel = $this->kernel = new ConcreteMicroKernel('test', false);
+        $kernel = $this->kernel = new ConcreteMicroKernel('test', false);
 
-            $expected = rtrim(sys_get_temp_dir(), '/').'/test';
-            $this->assertSame($expected, $kernel->getShareDir());
+        $expected = rtrim(sys_get_temp_dir(), '/').'/test';
+        $this->assertSame($expected, $kernel->getShareDir());
 
-            $parameters = $kernel->getKernelParameters();
-            $this->assertSame($expected, $parameters['kernel.share_dir'] ?? null);
-        } finally {
-            if (null === $previous) {
-                unset($_SERVER['APP_SHARE_DIR']);
-            } else {
-                $_SERVER['APP_SHARE_DIR'] = $previous;
-            }
-        }
+        $parameters = $kernel->getKernelParameters();
+        $this->assertArrayHasKey('kernel.share_dir', $parameters);
+        $this->assertNotNull($parameters['kernel.share_dir']);
+        $this->assertSame(realpath($expected), realpath($parameters['kernel.share_dir']));
     }
 
     public function test()