Apply suggestions from code review

Co-authored-by: Dmitri Perunov <[email protected]>

Author: loic425

src/Bundle/Context/Initiator/LegacyRequestContextInitiator.php

@@ -30,6 +30,15 @@ public function __construct(
         private RequestContextInitiatorInterface $decorated,
         private ?VarsResolverInterface $varsResolver = null,
     ) {
+        if (null === $varsResolver) {
+            trigger_deprecation(
+                'sylius/resource-bundle',
+                '1.14',
+                'Not passing an instance of "%s" as the fourth constructor argument for "%s" is deprecated and will not be supported in 2.0.',
+                VarsResolverInterface::class,
+                self::class,
+            );
+        }
     }
 
     public function initializeContext(Request $request): Context

src/Component/src/Metadata/Operation/HttpOperationInitiator.php

@@ -26,6 +26,15 @@ public function __construct(
         private ResourceMetadataCollectionFactoryInterface $resourceMetadataCollectionFactory,
         private ?VarsResolverInterface $varsResolver = null,
     ) {
+        if (null === $varsResolver) {
+            trigger_deprecation(
+                'sylius/resource-bundle',
+                '1.14',
+                'Not passing an instance of "%s" as the third constructor argument for "%s" is deprecated and will not be supported in 2.0.',
+                VarsResolverInterface::class,
+                self::class,
+            );
+        }
     }
 
     public function initializeOperation(Request $request): ?HttpOperation
@@ -61,20 +70,19 @@ public function initializeOperation(Request $request): ?HttpOperation
 
     private function getOperationWithVars(HttpOperation $operation): HttpOperation
     {
-        $operationVars = null !== $operation->getVars() ? $this->resolveVars($operation->getVars()) : null;
-
-        if (null !== $operationVars) {
-            $operation = $operation->withVars($operationVars);
-        }
+        $operationVars = $operation->getVars();
+        $resolvedOperationVars = $operationVars !== null ? $this->resolveVars($operationVars) : null;
 
-        $resource = $operation->getResource();
-        $resourceVars = $resource?->getVars();
+        $resourceVars = $operation->getResource()?->getVars();
+        $resolvedResourceVars = $resourceVars !== null ? $this->resolveVars($resourceVars) : null;
 
-        if (null === $resourceVars) {
+        if (null === $resolvedOperationVars && null === $resolvedResourceVars) {
             return $operation;
         }
 
-        return $operation->withVars(\array_merge($this->resolveVars($resourceVars), $operationVars ?? []));
+        $mergedVars = array_merge($resolvedResourceVars ?? [], $resolvedOperationVars ?? []);
+
+        return $operation->withVars($mergedVars);
     }
 
     private function resolveVars(array $vars): array

src/Component/tests/Metadata/Operation/HttpOperationInitiatorTest.php

@@ -97,7 +97,7 @@ public function testItInitializesHttpOperationsFromRequest(): void
         $this->assertSame($operation->reveal(), $initiator->initializeOperation($request->reveal()));
     }
 
-    public function testResolvesOperationVars(): void
+    public function testItResolvesOperationVars(): void
     {
         $request = $this->prophesize(Request::class);
         $attributes = $this->prophesize(ParameterBag::class);