Merge branch '7.0' into 7.1

* 7.0:
  Sync .github/expected-missing-return-types.diff
  [WebProfilerBundle] Fix the design of the compact toolbar button
  [AssetMapper] Improve link generation script
  fix merge
  consistently use dates in UTC in Doctrine connection tests
  Add missing Chinese(zh_TW) translations
  [Intl] [Emoji] Fix emoji files (remove wrong characters / add missing data)
  [Translation] Crowdin Bridge: use the project language mapping
  [VarExporter] Nitpicking in README.md
  [DoctrineBridge] Adapt deprecation message to include ODM bundle attribute name
  Added missing Serbian (sr_Cyrl) translation
  [Validator] Add missing Serbian translation
  [Validator] Add missing arabic translation
  [Validator] updated Albanian translation
  [Clock] Fix calling `mockTime()` in `setUpBeforeClass()`

Author: nicolas-grekas

.github/expected-missing-return-types.diff

@@ -10,35 +10,35 @@ git checkout composer.json src/
 diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 --- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
 +++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
-@@ -411,5 +411,5 @@ abstract class AbstractBrowser
+@@ -407,5 +407,5 @@ abstract class AbstractBrowser
       * @throws \RuntimeException When processing returns exit code
       */
 -    protected function doRequestInProcess(object $request)
 +    protected function doRequestInProcess(object $request): object
      {
          $deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
-@@ -444,5 +444,5 @@ abstract class AbstractBrowser
+@@ -440,5 +440,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
 
      /**
-@@ -455,5 +455,5 @@ abstract class AbstractBrowser
+@@ -451,5 +451,5 @@ abstract class AbstractBrowser
       * @throws LogicException When this abstract class is not implemented
       */
 -    protected function getScript(object $request)
 +    protected function getScript(object $request): string
      {
          throw new LogicException('To insulate requests, you need to override the getScript() method.');
-@@ -465,5 +465,5 @@ abstract class AbstractBrowser
+@@ -461,5 +461,5 @@ abstract class AbstractBrowser
       * @return object
       */
 -    protected function filterRequest(Request $request)
 +    protected function filterRequest(Request $request): object
      {
          return $request;
-@@ -475,5 +475,5 @@ abstract class AbstractBrowser
+@@ -471,5 +471,5 @@ abstract class AbstractBrowser
       * @return Response
       */
 -    protected function filterResponse(object $response)
@@ -402,14 +402,14 @@ diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/
 diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
 --- a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
 +++ b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
-@@ -226,5 +226,5 @@ abstract class AttributeClassLoader implements LoaderInterface
+@@ -234,5 +234,5 @@ abstract class AttributeClassLoader implements LoaderInterface
       * @return string
       */
 -    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
 +    protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
-@@ -325,5 +325,5 @@ abstract class AttributeClassLoader implements LoaderInterface
+@@ -333,5 +333,5 @@ abstract class AttributeClassLoader implements LoaderInterface
       * @return void
       */
 -    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);

.github/patch-types.php

@@ -25,6 +25,7 @@
         case false !== strpos($file, '/vendor/'):
         case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php'):
         case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Middleware/Debug/'):
+        case false !== strpos($file, '/src/Symfony/Bridge/Doctrine/Tests/Fixtures/LegacyQueryMock.php'):
         case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
         case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
         case false !== strpos($file, '/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php'):

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -200,7 +200,7 @@ private function initializeSubscribers(): void
                 continue;
             }
 
-            throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', get_debug_type($listener)));
+            throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed. Register it as a listener instead, using e.g. the #[AsDoctrineListener] or #[AsDocumentListener] attribute.', \is_object($listener) ? get_debug_type($listener) : $listener));
         }
     }
 

src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php

@@ -42,7 +42,7 @@ public function testUsingDoctrineSubscribersThrows()
         $this->evm = new ContainerAwareEventManager($this->container, [new MySubscriber(['foo'])]);
 
         $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Using Doctrine subscriber "Symfony\Bridge\Doctrine\Tests\MySubscriber" is not allowed, declare it as a listener instead.');
+        $this->expectExceptionMessage('Using Doctrine subscriber "Symfony\Bridge\Doctrine\Tests\MySubscriber" is not allowed. Register it as a listener instead, using e.g. the #[AsDoctrineListener] or #[AsDocumentListener] attribute.');
         $this->evm->getListeners('foo');
     }
 

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

@@ -47,6 +47,8 @@
 }
 
 .sf-minitoolbar {
+    --sf-toolbar-gray-800: #262626;
+
     background-color: var(--sf-toolbar-gray-800);
     border-top-left-radius: 4px;
     bottom: 0;
@@ -66,6 +68,8 @@
 }
 .sf-minitoolbar svg,
 .sf-minitoolbar img {
+    --sf-toolbar-gray-200: #e5e5e5;
+
     color: var(--sf-toolbar-gray-200);
     max-height: 24px;
     max-width: 24px;

src/Symfony/Component/AssetMapper/ImportMap/ImportMapRenderer.php

@@ -78,7 +78,7 @@ public function render(string|array $entryPoint, array $attributes = []): string
                 // importmap entry is a noop
                 $importMap[$importName] = 'data:application/javascript,';
             } else {
-                $importMap[$importName] = 'data:application/javascript,'.rawurlencode(sprintf('const d=document,l=d.createElement("link");l.rel="stylesheet",l.href="%s",(d.head||d.getElementsByTagName("head")[0]).appendChild(l)', $path));
+                $importMap[$importName] = 'data:application/javascript,'.rawurlencode(sprintf('document.head.appendChild(Object.assign(document.createElement("link"),{rel:"stylesheet",href:"%s"}))', addslashes($path)));
             }
         }
 

src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapRendererTest.php

@@ -92,7 +92,7 @@ public function testBasicRender()
         $this->assertStringContainsString('"app_css_preload": "data:application/javascript,', $html);
         $this->assertStringContainsString('<link rel="stylesheet" href="/subdirectory/assets/styles/app-preload-d1g35t.css">', $html);
         // non-preloaded CSS file
-        $this->assertStringContainsString('"app_css_no_preload": "data:application/javascript,const%20d%3Ddocument%2Cl%3Dd.createElement%28%22link%22%29%3Bl.rel%3D%22stylesheet%22%2Cl.href%3D%22%2Fsubdirectory%2Fassets%2Fstyles%2Fapp-nopreload-d1g35t.css%22%2C%28d.head%7C%7Cd.getElementsByTagName%28%22head%22%29%5B0%5D%29.appendChild%28l%29', $html);
+        $this->assertStringContainsString('"app_css_no_preload": "data:application/javascript,document.head.appendChild%28Object.assign%28document.createElement%28%22link%22%29%2C%7Brel%3A%22stylesheet%22%2Chref%3A%22%2Fsubdirectory%2Fassets%2Fstyles%2Fapp-nopreload-d1g35t.css%22%7D', $html);
         $this->assertStringNotContainsString('<link rel="stylesheet" href="/subdirectory/assets/styles/app-nopreload-d1g35t.css">', $html);
         // remote js
         $this->assertStringContainsString('"remote_js": "https://cdn.example.com/assets/remote-d1g35t.js"', $html);

src/Symfony/Component/Clock/Test/ClockSensitiveTrait.php

@@ -42,14 +42,20 @@ public static function mockTime(string|\DateTimeImmutable|bool $when = true): Cl
     }
 
     /**
+     * @beforeClass
+     *
      * @before
      *
      * @internal
      */
-    protected static function saveClockBeforeTest(bool $save = true): ClockInterface
+    public static function saveClockBeforeTest(bool $save = true): ClockInterface
     {
         static $originalClock;
 
+        if ($save && $originalClock) {
+            self::restoreClockAfterTest();
+        }
+
         return $save ? $originalClock = Clock::get() : $originalClock;
     }
 

src/Symfony/Component/Clock/Tests/ClockBeforeClassTest.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Clock\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Psr\Clock\ClockInterface;
+use Symfony\Component\Clock\Clock;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Clock\NativeClock;
+use Symfony\Component\Clock\Test\ClockSensitiveTrait;
+
+class ClockBeforeClassTest extends TestCase
+{
+    use ClockSensitiveTrait;
+
+    private static ?ClockInterface $clock = null;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::$clock = self::mockTime();
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        self::$clock = null;
+    }
+
+    public function testMockClock()
+    {
+        $this->assertInstanceOf(MockClock::class, self::$clock);
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $clock = self::mockTime();
+        $this->assertInstanceOf(MockClock::class, Clock::get());
+        $this->assertSame(Clock::get(), $clock);
+
+        $this->assertNotSame($clock, self::$clock);
+
+        self::restoreClockAfterTest();
+        self::saveClockBeforeTest();
+
+        $this->assertInstanceOf(MockClock::class, self::$clock);
+        $this->assertInstanceOf(NativeClock::class, Clock::get());
+
+        $clock = self::mockTime();
+        $this->assertInstanceOf(MockClock::class, Clock::get());
+        $this->assertSame(Clock::get(), $clock);
+
+        $this->assertNotSame($clock, self::$clock);
+    }
+}