MAGETWO-57868: Search fails with an error when used user-defined price attribute as searchable - for mainline

Author: xmav

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php

@@ -20,7 +20,7 @@ interface GeneratorInterface
     public function getFilterData(Attribute $attribute, $filterName);
 
     /**
-     * Get aggregations data for specific attribute
+     * Get aggregation data for specific attribute
      * @param Attribute $attribute
      * @param string $bucketName
      * @return array

app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php

@@ -31,9 +31,16 @@ public function __construct(GeneratorInterface $defaultGenerator, array $generat
     /**
      * @param string $type
      * @return GeneratorInterface
+     * @throws \InvalidArgumentException
      */
     public function getGeneratorForType($type)
     {
-        return isset($this->generators[$type]) ? $this->generators[$type] : $this->defaultGenerator;
+        $generator = isset($this->generators[$type]) ? $this->generators[$type] : $this->defaultGenerator;
+        if (!($generator instanceof GeneratorInterface)) {
+            throw new \InvalidArgumentException(
+                'Generator must implement ' . GeneratorInterface::class
+            );
+        }
+        return $generator;
     }
 }

app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/GeneratorResolverTest.php

@@ -37,6 +37,10 @@ protected function setUp()
         $this->rangeGenerator = $this->getMockBuilder(GeneratorInterface::class)
             ->setMethods([])
             ->getMockForAbstractClass();
+
+        $invalidTypeGenerator = $this->getMockBuilder(\stdClass::class)
+            ->setMethods([]);
+
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->resolver = $objectManager->getObject(
             GeneratorResolver::class,
@@ -45,6 +49,7 @@ protected function setUp()
                 'generators' => [
                     'datetime' => $this->datetimeGenerator,
                     'range' => $this->datetimeGenerator,
+                    'invalid_type' => $invalidTypeGenerator,
                 ],
             ]
         );
@@ -60,4 +65,12 @@ public function testGetFallbackGenerator()
     {
         $this->assertEquals($this->defaultGenerator, $this->resolver->getGeneratorForType('unknown_type'));
     }
+
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testGetInvalidGeneratorType()
+    {
+        $this->resolver->getGeneratorForType('invalid_type');
+    }
 }