Use proper authorative-autoloader for app autoloaders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 2 insertions, 11 deletions

diff --git a/apps/encryption/composer/composer.json b/apps/encryption/composer/composer.json
index 5b38c9dc683..4211734dbf5 100644
--- a/apps/encryption/composer/composer.json
+++ b/apps/encryption/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Encryption"
     },
     "autoload" : {
diff --git a/apps/encryption/composer/composer/autoload_real.php b/apps/encryption/composer/composer/autoload_real.php
index fae90387a09..f79c0265ce0 100644
--- a/apps/encryption/composer/composer/autoload_real.php
+++ b/apps/encryption/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitEncryption
 
             call_user_func(\Composer\Autoload\ComposerStaticInitEncryption::getInitializer($loader));
         } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }
         }
 
+        $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
         return $loader;