summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api/composer
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-12-14 08:31:31 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-12-14 08:31:31 +0100
commit49b095b78e46090f731314a914786d8ddbb04bbb (patch)
tree31603d4460efd017238ab5abed1b14aa8dca09e3 /apps/provisioning_api/composer
parentce12763ab7e29d8b41ef1b0594923f7911decea9 (diff)
downloadnextcloud-server-49b095b78e46090f731314a914786d8ddbb04bbb.tar.gz
nextcloud-server-49b095b78e46090f731314a914786d8ddbb04bbb.zip
Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/provisioning_api/composer')
-rw-r--r--apps/provisioning_api/composer/composer.json2
-rw-r--r--apps/provisioning_api/composer/composer/autoload_real.php11
2 files changed, 2 insertions, 11 deletions
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;