Merge remote-tracking branch 'af/B2B-2658-hydrator' into B2B-2658

Author: rganin

app/code/Magento/GraphQlResolverCache/Model/Resolver/Result/HydratorDehydratorProvider.php

@@ -61,19 +61,21 @@ public function __construct(
     public function getDehydratorForResolver(ResolverInterface $resolver): ?DehydratorInterface
     {
         $resolverClass = $this->getResolverClass($resolver);
-        if (isset($this->dehydratorInstances[$resolverClass])) {
+        if (array_key_exists($resolverClass, $this->dehydratorInstances)) {
             return $this->dehydratorInstances[$resolverClass];
         }
         $resolverDehydrators = $this->getInstancesForResolver($resolver, $this->dehydratorConfig);
-        if (!empty($resolverDehydrators)) {
+        if (empty($resolverDehydrators)) {
+            $this->dehydratorInstances[$resolverClass] = null;
+        } else {
             $this->dehydratorInstances[$resolverClass] = $this->objectManager->create(
                 DehydratorComposite::class,
                 [
                     'dehydrators' => $resolverDehydrators
                 ]
             );
         }
-        return $this->dehydratorInstances[$resolverClass] ?? null;
+        return $this->dehydratorInstances[$resolverClass];
     }
 
     /**
@@ -82,19 +84,21 @@ public function getDehydratorForResolver(ResolverInterface $resolver): ?Dehydrat
     public function getHydratorForResolver(ResolverInterface $resolver): ?HydratorInterface
     {
         $resolverClass = $this->getResolverClass($resolver);
-        if (isset($this->hydratorInstances[$resolverClass])) {
+        if (array_key_exists($resolverClass, $this->hydratorInstances)) {
             return $this->hydratorInstances[$resolverClass];
         }
         $resolverHydrators = $this->getInstancesForResolver($resolver, $this->hydratorConfig);
-        if (!empty($resolverHydrators)) {
+        if (empty($resolverHydrators)) {
+            $this->hydratorInstances[$resolverClass] = null;
+        } else {
             $this->hydratorInstances[$resolverClass] = $this->objectManager->create(
                 HydratorComposite::class,
                 [
                     'hydrators' => $resolverHydrators
                 ]
             );
         }
-        return $this->hydratorInstances[$resolverClass] ?? null;
+        return $this->hydratorInstances[$resolverClass];
     }
 
     /**
@@ -124,7 +128,6 @@ private function getInstancesForResolver(ResolverInterface $resolver, array $cla
             }
         }
         if (empty($resolverClassesConfig)) {
-            $this->dehydratorInstances[$this->getResolverClass($resolver)] = null;
             return [];
         }
         $dataProcessingClassList = [];