MAGETWO-67871: Requesting autogenerated classes that are not in constructor cause fatal errors in production mode

- refactor

Author: Igor Melnikov

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -89,7 +89,7 @@ public function __construct(
         $this->scopeResolver = $scopeResolver;
         $this->customerSession = $customerSession;
         $this->indexerFrontendResource = $indexerFrontendResource ?: ObjectManager::getInstance()->get(
-            Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\FrontendResource::class
+            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\FrontendResource::class
         );
         $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
             ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);

dev/tests/static/testsuite/Magento/Test/Legacy/AutogeneratedClassNotInConstructorTest.php

@@ -43,13 +43,14 @@ protected function setUp()
 
     public function testAutogeneratedClassesRequestedInConstructor()
     {
-        $fileTypes = Files::INCLUDE_APP_CODE | Files::INCLUDE_LIBS | Files::INCLUDE_SETUP;
-        $changedFiles = ChangedFiles::getPhpFiles(__DIR__ . '/../_files/changed_files*', $fileTypes);
+        $fileTypes = Files::INCLUDE_APP_CODE | Files::INCLUDE_LIBS | Files::INCLUDE_SETUP | Files::AS_DATA_SET;
+        $changedFiles = ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*', $fileTypes);
         $phpFiles = $this->fileUtilities->getPhpFiles($fileTypes);
 
         $existingClasses = [];
         $classesCreatedByObjectManager = [];
-        foreach ($changedFiles as $filePath) {
+        foreach ($phpFiles as $file) {
+            $filePath = $file[0];
             $fileContent = file_get_contents($filePath);
             $className = $this->classNameExtractor->getNameWithNamespace($fileContent);
             if ($className) {
@@ -59,7 +60,8 @@ public function testAutogeneratedClassesRequestedInConstructor()
                 );
             }
         }
-        foreach ($phpFiles as $filePath) {
+        foreach ($changedFiles as $file) {
+            $filePath = $file[0];
             $fileContent = file_get_contents($filePath);
             $className = $this->classNameExtractor->getNameWithNamespace($fileContent);
             if ($className) {