Fix merge

nicolas-grekas · nicolas-grekas · commit cd4ca48a2e18 · 2023-01-13T10:29:14.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -425,7 +425,7 @@ protected static function getMonologInline_LoggerService($container)
      */
     protected static function getPAService($container)
     {
-        $a = ($container->privates['pC'] ?? $container->getPCService());
+        $a = ($container->privates['pC'] ?? self::getPCService($container));
 
         if (isset($container->services['pA'])) {
             return $container->services['pA'];
@@ -434,7 +434,7 @@ protected static function getPAService($container)
 
         $container->services['pA'] = $instance = new \stdClass($b, $a);
 
-        $b->d = ($container->privates['pD'] ?? $container->getPDService());
+        $b->d = ($container->privates['pD'] ?? self::getPDService($container));
 
         return $instance;
     }
diff --git a/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php b/src/Symfony/Component/Serializer/Tests/NameConverter/MetadataAwareNameConverterTest.php
@@ -58,7 +58,7 @@ public function testNormalizeWithFallback($propertyName, $expected)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('normalize')
-            ->willReturnCallback(strtoupper(...))
+            ->willReturnCallback(fn ($propertyName) => strtoupper($propertyName))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);
@@ -88,7 +88,7 @@ public function testDenormalizeWithFallback($expected, $propertyName)
         $fallback = $this->createMock(NameConverterInterface::class);
         $fallback
             ->method('denormalize')
-            ->willReturnCallback(strtolower(...))
+            ->willReturnCallback(fn ($propertyName) => strtolower($propertyName))
         ;
 
         $nameConverter = new MetadataAwareNameConverter($classMetadataFactory, $fallback);

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,7 @@ protected static function getMonologInline_LoggerService($container)`
`425`	`425`	`*/`
`426`	`426`	`protected static function getPAService($container)`
`427`	`427`	`{`
`428`		`- $a = ($container->privates['pC'] ?? $container->getPCService());`
	`428`	`+ $a = ($container->privates['pC'] ?? self::getPCService($container));`
`429`	`429`
`430`	`430`	`if (isset($container->services['pA'])) {`
`431`	`431`	`return $container->services['pA'];`
`@@ -434,7 +434,7 @@ protected static function getPAService($container)`
`434`	`434`
`435`	`435`	`$container->services['pA'] = $instance = new \stdClass($b, $a);`
`436`	`436`
`437`		`- $b->d = ($container->privates['pD'] ?? $container->getPDService());`
	`437`	`+ $b->d = ($container->privates['pD'] ?? self::getPDService($container));`
`438`	`438`
`439`	`439`	`return $instance;`
`440`	`440`	`}`