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

Author: rganin

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

@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQlResolverCache\Model\Resolver\Result;
 
+use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\ObjectManagerInterface;
 
@@ -64,7 +65,11 @@ public function getDehydratorForResolver(ResolverInterface $resolver): ?Dehydrat
         if (array_key_exists($resolverClass, $this->dehydratorInstances)) {
             return $this->dehydratorInstances[$resolverClass];
         }
-        $resolverDehydrators = $this->getInstancesForResolver($resolver, $this->dehydratorConfig);
+        $resolverDehydrators = $this->getInstancesForResolver(
+            $resolver,
+            $this->dehydratorConfig,
+            DehydratorInterface::class
+        );
         if (empty($resolverDehydrators)) {
             $this->dehydratorInstances[$resolverClass] = null;
         } else {
@@ -87,7 +92,11 @@ public function getHydratorForResolver(ResolverInterface $resolver): ?HydratorIn
         if (array_key_exists($resolverClass, $this->hydratorInstances)) {
             return $this->hydratorInstances[$resolverClass];
         }
-        $resolverHydrators = $this->getInstancesForResolver($resolver, $this->hydratorConfig);
+        $resolverHydrators = $this->getInstancesForResolver(
+            $resolver,
+            $this->hydratorConfig,
+            HydratorInterface::class
+        );
         if (empty($resolverHydrators)) {
             $this->hydratorInstances[$resolverClass] = null;
         } else {
@@ -117,10 +126,15 @@ private function getResolverClass(ResolverInterface $resolver): string
      *
      * @param ResolverInterface $resolver
      * @param array $classesConfig
+     * @param string $interfaceName
      * @return array
+     * @throws ConfigurationMismatchException
      */
-    private function getInstancesForResolver(ResolverInterface $resolver, array $classesConfig): array
-    {
+    private function getInstancesForResolver(
+        ResolverInterface $resolver,
+        array $classesConfig,
+        string $interfaceName
+    ): array {
         $resolverClassesConfig = [];
         foreach ($this->getResolverClassChain($resolver) as $resolverClass) {
             if (isset($classesConfig[$resolverClass])) {
@@ -131,9 +145,32 @@ private function getInstancesForResolver(ResolverInterface $resolver, array $cla
             return [];
         }
         $dataProcessingClassList = [];
-        foreach ($resolverClassesConfig as $classChain) {
+        foreach ($resolverClassesConfig as $resolverClass => $classChain) {
             foreach ($classChain as $classData) {
-                $dataProcessingClassList[] = $classData;
+                if (is_a($classData['class'], $interfaceName, true)) {
+                    $dataProcessingClassList[] = $classData;
+                } else {
+                    if ($interfaceName == HydratorInterface::class) {
+                        throw new ConfigurationMismatchException(
+                            __(
+                                'Hydrator %1 configured for resolver %2 must implement %3.',
+                                $classData['class'],
+                                $resolverClass,
+                                $interfaceName
+                            )
+                        );
+                    } else {
+                        throw new ConfigurationMismatchException(
+                            __(
+                                'Dehydrator %1 configured for resolver %2 must implement %3.',
+                                $classData['class'],
+                                $resolverClass,
+                                $interfaceName
+                            )
+                        );
+                    }
+
+                }
             }
         }
         usort($dataProcessingClassList, function ($data1, $data2) {

app/code/Magento/GraphQlResolverCache/i18n/en_US.csv

@@ -1,2 +1,4 @@
 "GraphQL Query Resolver Results","GraphQL Query Resolver Results"
 "Results from resolvers in GraphQL queries","Results from resolvers in GraphQL queries"
+"Hydrator %1 configured for resolver %2 must implement %3.","Hydrator %1 configured for resolver %2 must implement %3."
+"Deydrator %1 configured for resolver %2 must implement %3.","Dehydrator %1 configured for resolver %2 must implement %3."

dev/tests/integration/testsuite/Magento/GraphQlResolverCache/Model/Resolver/Result/HydratorDehydratorProviderTest.php

@@ -91,6 +91,7 @@ public function testHydratorChainProvider()
 
         $testModelDehydrator = $this->getMockBuilder(DehydratorInterface::class)
             ->disableOriginalConstructor()
+            ->setMockClassName('TestResolverModelDehydrator')
             ->onlyMethods(['dehydrate'])
             ->getMock();
 
@@ -103,6 +104,7 @@ public function testHydratorChainProvider()
 
         $testModelHydrator = $this->getMockBuilder(HydratorInterface::class)
             ->disableOriginalConstructor()
+            ->setMockClassName('TestResolverModelHydrator')
             ->onlyMethods(['hydrate'])
             ->getMock();
         $testModelHydrator->expects($this->once())
@@ -114,9 +116,10 @@ public function testHydratorChainProvider()
             });
         $testNestedHydrator = $this->getMockBuilder(HydratorInterface::class)
             ->disableOriginalConstructor()
+            ->setMockClassName('TestResolverNestedItemsHydrator')
             ->onlyMethods(['hydrate'])
             ->getMock();
-        $testModelHydrator->expects($this->once())
+        $testNestedHydrator->expects($this->once())
             ->method('hydrate')
             ->willReturnCallback(function (&$resolverData) {
                 $resolverData['model']->setData('nested_data', ['test_nested_data']);