MAGETWO-67626: Auto-generated classes behave differently in unit tests and application

- removed 'generated' folder from base application autoload paths

Author: buskamuza

app/autoload.php

@@ -35,6 +35,3 @@
 }
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
-
-// Sets default autoload mappings, may be overridden in Bootstrap::create
-\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/bootstrap.php

@@ -28,6 +28,9 @@
 }
 
 require_once __DIR__ . '/autoload.php';
+// Sets default autoload mappings, may be overridden in Bootstrap::create
+\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
+
 require_once BP . '/app/functions.php';
 
 /* Custom umask value may be provided in optional mage_umask file in root */

composer.json

@@ -236,8 +236,7 @@
         },
         "psr-0": {
             "": [
-                "app/code/",
-                "generated/code"
+                "app/code/"
             ]
         },
         "files": [

lib/internal/Magento/Framework/Autoload/Populator.php

@@ -6,7 +6,6 @@
 namespace Magento\Framework\Autoload;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Autoload\AutoloaderInterface;
 use Magento\Framework\Filesystem\FileResolver;
 
 /**
@@ -23,16 +22,9 @@ class Populator
     public static function populateMappings(AutoloaderInterface $autoloader, DirectoryList $dirList)
     {
         $generationDir = $dirList->getPath(DirectoryList::GENERATED_CODE);
-        $frameworkDir = $dirList->getPath(DirectoryList::LIB_INTERNAL);
 
         $autoloader->addPsr4('Magento\\', [$generationDir . '/Magento/'], true);
 
-        $autoloader->addPsr0('Cm_', $frameworkDir, true);
-        $autoloader->addPsr0('Credis_', $frameworkDir, true);
-
-        /** Required for Zend functionality */
-        FileResolver::addIncludePath($frameworkDir);
-
         /** Required for code generation to occur */
         FileResolver::addIncludePath($generationDir);