From 49b095b78e46090f731314a914786d8ddbb04bbb Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Thu, 14 Dec 2017 08:31:31 +0100
Subject: Use proper authorative-autoloader for app autoloaders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 apps/provisioning_api/composer/composer.json              |  2 +-
 apps/provisioning_api/composer/composer/autoload_real.php | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'apps/provisioning_api/composer')

diff --git a/apps/provisioning_api/composer/composer.json b/apps/provisioning_api/composer/composer.json
index ea2a43abc8e..a5130163cec 100644
--- a/apps/provisioning_api/composer/composer.json
+++ b/apps/provisioning_api/composer/composer.json
@@ -2,7 +2,7 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true,
+        "classmap-authoritative": true,
         "autoloader-suffix": "Provisioning_API"
     },
     "autoload" : {
diff --git a/apps/provisioning_api/composer/composer/autoload_real.php b/apps/provisioning_api/composer/composer/autoload_real.php
index c55cebd2f63..33867a60f69 100644
--- a/apps/provisioning_api/composer/composer/autoload_real.php
+++ b/apps/provisioning_api/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitProvisioning_API
 
             call_user_func(\Composer\Autoload\ComposerStaticInitProvisioning_API::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;
-- 
cgit v1.2.3