MAGETWO-39709: Merge configuration for search_request.xml does not work

Maksym Aposov · Maksym Aposov · commit 2686bc42ec63 · 2015-07-07T12:55:08.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/Request/Config/FileSystemReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Search/Request/Config/FileSystemReaderTest.php
@@ -25,9 +25,7 @@ public function testRead()
     {
         $result = $this->object->read();
         // Filter values added by \Magento\CatalogSearch\Model\Search\ReaderPlugin
-        $result = array_filter($result, function ($k) {
-            return in_array($k, ['bool_query', 'filter_query', 'new_match_query']);
-        }, ARRAY_FILTER_USE_KEY);
+        $result = array_intersect_key($result, array_flip(['bool_query', 'filter_query', 'new_match_query']));
         $expected = include __DIR__ . '/../../_files/search_request_merged.php';
         $this->assertEquals($expected, $result);
     }

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@ public function testRead()`
`25`	`25`	`{`
`26`	`26`	`$result = $this->object->read();`
`27`	`27`	`// Filter values added by \Magento\CatalogSearch\Model\Search\ReaderPlugin`
`28`		`- $result = array_filter($result, function ($k) {`
`29`		`- return in_array($k, ['bool_query', 'filter_query', 'new_match_query']);`
`30`		`- }, ARRAY_FILTER_USE_KEY);`
	`28`	`+ $result = array_intersect_key($result, array_flip(['bool_query', 'filter_query', 'new_match_query']));`
`31`	`29`	`$expected = include __DIR__ . '/../../_files/search_request_merged.php';`
`32`	`30`	`$this->assertEquals($expected, $result);`
`33`	`31`	`}`