Merge remote-tracking branch 'bp1222/save-loads'

src/Composer/Autoload/AutoloadGenerator.php

@@ -568,33 +568,35 @@ class ComposerAutoloaderInit$suffix
 
 HEADER;
 
-        if ($useIncludePath) {
+        if (!$this->classMapAuthoritative) {
-            $file .= <<<'INCLUDE_PATH'
+            if ($useIncludePath) {
-        $includePaths = require __DIR__ . '/include_paths.php';
+                $file .= <<<'INCLUDE_PATH'
-        array_push($includePaths, get_include_path());
+            $includePaths = require __DIR__ . '/include_paths.php';
-        set_include_path(join(PATH_SEPARATOR, $includePaths));
+            array_push($includePaths, get_include_path());
+            set_include_path(join(PATH_SEPARATOR, $includePaths));
 
 
 INCLUDE_PATH;
-        }
+            }
 
-        $file .= <<<'PSR0'
+            $file .= <<<'PSR0'
-        $map = require __DIR__ . '/autoload_namespaces.php';
+            $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
+            foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
+                $loader->set($namespace, $path);
-        }
+            }
 
 
 PSR0;
 
-        $file .= <<<'PSR4'
+            $file .= <<<'PSR4'
-        $map = require __DIR__ . '/autoload_psr4.php';
+            $map = require __DIR__ . '/autoload_psr4.php';
-        foreach ($map as $namespace => $path) {
+            foreach ($map as $namespace => $path) {
-            $loader->setPsr4($namespace, $path);
+                $loader->setPsr4($namespace, $path);
-        }
+            }
 
 
 PSR4;
+        }
 
         if ($useClassMap) {
             $file .= <<<'CLASSMAP'