Merge branch '6.1' into 6.2

nicolas-grekas · nicolas-grekas · commit 51cc266eee1a · 2023-01-11T12:53:46.000+01:00
* 6.1:
  Revert "minor #47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)"
  [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container
  [DependencyInjection] Fix support for named arguments on non-autowired services
diff --git a/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php b/Tests/Controller/ArgumentResolver/DateTimeValueResolverTest.php
@@ -35,8 +35,8 @@ protected function tearDown(): void
     public static function getTimeZones()
     {
         yield ['UTC'];
-        yield ['Etc/GMT+9'];
-        yield ['Etc/GMT-14'];
+        yield ['Pacific/Honolulu'];
+        yield ['America/Toronto'];
     }
 
     public static function getClasses()

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ protected function tearDown(): void`
`35`	`35`	`public static function getTimeZones()`
`36`	`36`	`{`
`37`	`37`	`yield ['UTC'];`
`38`		`- yield ['Etc/GMT+9'];`
`39`		`- yield ['Etc/GMT-14'];`
	`38`	`+ yield ['Pacific/Honolulu'];`
	`39`	`+ yield ['America/Toronto'];`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public static function getClasses()`