Merge branch '6.3' into 6.4

derrabus · derrabus · commit 8c48869b9c7c · 2023-07-31T13:58:58.000+02:00
* 6.3:
  load function only if not loaded before
  Bump Symfony version to 6.2.15
  Update VERSION for 6.2.14
  Update CHANGELOG for 6.2.14
  Bump Symfony version to 6.3.4
  Update VERSION for 6.3.3
  Update CHANGELOG for 6.3.3
  Bump Symfony version to 5.4.28
  Update VERSION for 5.4.27
  Update CONTRIBUTORS for 5.4.27
  Update CHANGELOG for 5.4.27
diff --git a/CHANGELOG-6.2.md b/CHANGELOG-6.2.md
@@ -7,6 +7,10 @@ in 6.2 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.2.0...v6.2.1
 
+* 6.2.14 (2023-07-31)
+
+ * bug #51178 [Finder] Revert "Fix children condition in ExcludeDirectoryFilterIterator" (derrabus)
+
 * 6.2.13 (2023-07-30)
 
  * bug #50933 [Serializer] Fix deserializing nested arrays of objects with mixed keys (HypeMC)
diff --git a/CHANGELOG-6.3.md b/CHANGELOG-6.3.md
@@ -7,6 +7,10 @@ in 6.3 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.3.0...v6.3.1
 
+* 6.3.3 (2023-07-31)
+
+ * bug #51178 [Finder] Revert "Fix children condition in ExcludeDirectoryFilterIterator" (derrabus)
+
 * 6.3.2 (2023-07-30)
 
  * bug #51138 [Scheduler] Postpone schedule creation (HypeMC)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -163,14 +163,14 @@ The Symfony Connect username in parenthesis allows to get more information
  - marc.weistroff
  - lenar
  - Jesse Rushlow (geeshoe)
+ - Jacob Dreesen (jdreesen)
  - Théo FIDRY
  - Jeroen Spee (jeroens)
  - Michael Babker (mbabker)
  - Włodzimierz Gajda (gajdaw)
  - Hugo Alliaume (kocal)
  - Christian Scheb
  - Guillaume (guill)
- - Jacob Dreesen (jdreesen)
  - Olivier Dolbeau (odolbeau)
  - Florian Voutzinos (florianv)
  - zairig imad (zairigimad)
diff --git a/src/Symfony/Component/Clock/Resources/now.php b/src/Symfony/Component/Clock/Resources/now.php
@@ -11,13 +11,15 @@
 
 namespace Symfony\Component\Clock;
 
-/**
- * Returns the current time as a DateTimeImmutable.
- *
- * Note that you should prefer injecting a ClockInterface or using
- * ClockAwareTrait when possible instead of using this function.
- */
-function now(): \DateTimeImmutable
-{
-    return Clock::get()->now();
+if (!\function_exists(now::class)) {
+    /**
+     * Returns the current time as a DateTimeImmutable.
+     *
+     * Note that you should prefer injecting a ClockInterface or using
+     * ClockAwareTrait when possible instead of using this function.
+     */
+    function now(): \DateTimeImmutable
+    {
+        return Clock::get()->now();
+    }
 }
