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: [PATCH] Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
apps/admin_audit/composer/composer.json | 2 +-
apps/admin_audit/composer/composer/autoload_real.php | 11 +----------
apps/comments/composer/composer.json | 2 +-
apps/comments/composer/composer/autoload_real.php | 11 +----------
apps/dav/composer/composer.json | 2 +-
apps/dav/composer/composer/autoload_real.php | 11 +----------
apps/encryption/composer/composer.json | 2 +-
apps/encryption/composer/composer/autoload_real.php | 11 +----------
apps/federatedfilesharing/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/federation/composer/composer.json | 2 +-
apps/federation/composer/composer/autoload_real.php | 11 +----------
apps/files/composer/composer.json | 2 +-
apps/files/composer/composer/autoload_real.php | 11 +----------
apps/files_sharing/composer/composer.json | 2 +-
.../files_sharing/composer/composer/autoload_real.php | 11 +----------
apps/files_trashbin/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/files_versions/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/lookup_server_connector/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/oauth2/composer/composer.json | 2 +-
apps/oauth2/composer/composer/autoload_real.php | 11 +----------
apps/provisioning_api/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/sharebymail/composer/composer.json | 2 +-
apps/sharebymail/composer/composer/autoload_real.php | 11 +----------
apps/systemtags/composer/composer.json | 2 +-
apps/systemtags/composer/composer/autoload_real.php | 11 +----------
apps/testing/composer/composer.json | 2 +-
apps/testing/composer/composer/autoload_real.php | 11 +----------
apps/twofactor_backupcodes/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/updatenotification/composer/composer.json | 2 +-
.../composer/composer/autoload_real.php | 11 +----------
apps/user_ldap/composer/composer.json | 2 +-
apps/user_ldap/composer/composer/autoload_real.php | 11 +----------
38 files changed, 38 insertions(+), 209 deletions(-)
diff --git a/apps/admin_audit/composer/composer.json b/apps/admin_audit/composer/composer.json
index ae9b104b697..e55d720f8bf 100644
--- a/apps/admin_audit/composer/composer.json
+++ b/apps/admin_audit/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "AdminAudit"
},
"autoload" : {
diff --git a/apps/admin_audit/composer/composer/autoload_real.php b/apps/admin_audit/composer/composer/autoload_real.php
index 1cbbc489538..8c3108af88c 100644
--- a/apps/admin_audit/composer/composer/autoload_real.php
+++ b/apps/admin_audit/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitAdminAudit
call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::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;
diff --git a/apps/comments/composer/composer.json b/apps/comments/composer/composer.json
index 523394b5d8e..40fe9ae34be 100644
--- a/apps/comments/composer/composer.json
+++ b/apps/comments/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Comments"
},
"autoload" : {
diff --git a/apps/comments/composer/composer/autoload_real.php b/apps/comments/composer/composer/autoload_real.php
index 1ce284f24f4..40e29b668a4 100644
--- a/apps/comments/composer/composer/autoload_real.php
+++ b/apps/comments/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitComments
call_user_func(\Composer\Autoload\ComposerStaticInitComments::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;
diff --git a/apps/dav/composer/composer.json b/apps/dav/composer/composer.json
index e783ae8ad15..c4c5a654f80 100644
--- a/apps/dav/composer/composer.json
+++ b/apps/dav/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "DAV"
},
"autoload" : {
diff --git a/apps/dav/composer/composer/autoload_real.php b/apps/dav/composer/composer/autoload_real.php
index cd699e0b4fd..044f006c3b6 100644
--- a/apps/dav/composer/composer/autoload_real.php
+++ b/apps/dav/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitDAV
call_user_func(\Composer\Autoload\ComposerStaticInitDAV::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;
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;
diff --git a/apps/federatedfilesharing/composer/composer.json b/apps/federatedfilesharing/composer/composer.json
index 3cb32db12f2..effe5afe0f2 100644
--- a/apps/federatedfilesharing/composer/composer.json
+++ b/apps/federatedfilesharing/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "FederatedFileSharing"
},
"autoload" : {
diff --git a/apps/federatedfilesharing/composer/composer/autoload_real.php b/apps/federatedfilesharing/composer/composer/autoload_real.php
index bdc3ad006ae..6f491ff4175 100644
--- a/apps/federatedfilesharing/composer/composer/autoload_real.php
+++ b/apps/federatedfilesharing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFederatedFileSharing
call_user_func(\Composer\Autoload\ComposerStaticInitFederatedFileSharing::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;
diff --git a/apps/federation/composer/composer.json b/apps/federation/composer/composer.json
index 2c9a66b242c..affe383c1c8 100644
--- a/apps/federation/composer/composer.json
+++ b/apps/federation/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Federation"
},
"autoload" : {
diff --git a/apps/federation/composer/composer/autoload_real.php b/apps/federation/composer/composer/autoload_real.php
index f2906437fdb..39f8fb171dc 100644
--- a/apps/federation/composer/composer/autoload_real.php
+++ b/apps/federation/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFederation
call_user_func(\Composer\Autoload\ComposerStaticInitFederation::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;
diff --git a/apps/files/composer/composer.json b/apps/files/composer/composer.json
index 3412d9507b2..4777604b5bf 100644
--- a/apps/files/composer/composer.json
+++ b/apps/files/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Files"
},
"autoload" : {
diff --git a/apps/files/composer/composer/autoload_real.php b/apps/files/composer/composer/autoload_real.php
index fe9ef0b02ae..3e6eddd34f5 100644
--- a/apps/files/composer/composer/autoload_real.php
+++ b/apps/files/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles
call_user_func(\Composer\Autoload\ComposerStaticInitFiles::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;
diff --git a/apps/files_sharing/composer/composer.json b/apps/files_sharing/composer/composer.json
index d500819ff82..145655efbf3 100644
--- a/apps/files_sharing/composer/composer.json
+++ b/apps/files_sharing/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Files_Sharing"
},
"autoload" : {
diff --git a/apps/files_sharing/composer/composer/autoload_real.php b/apps/files_sharing/composer/composer/autoload_real.php
index 504c701247f..bd07706a288 100644
--- a/apps/files_sharing/composer/composer/autoload_real.php
+++ b/apps/files_sharing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Sharing
call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Sharing::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;
diff --git a/apps/files_trashbin/composer/composer.json b/apps/files_trashbin/composer/composer.json
index c43b78e83ea..81035a0746e 100644
--- a/apps/files_trashbin/composer/composer.json
+++ b/apps/files_trashbin/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Files_Trashbin"
},
"autoload" : {
diff --git a/apps/files_trashbin/composer/composer/autoload_real.php b/apps/files_trashbin/composer/composer/autoload_real.php
index b2abf10922c..7b05d7dd53a 100644
--- a/apps/files_trashbin/composer/composer/autoload_real.php
+++ b/apps/files_trashbin/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Trashbin
call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::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;
diff --git a/apps/files_versions/composer/composer.json b/apps/files_versions/composer/composer.json
index fdad5a69ddb..790e9547113 100644
--- a/apps/files_versions/composer/composer.json
+++ b/apps/files_versions/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Files_Versions"
},
"autoload" : {
diff --git a/apps/files_versions/composer/composer/autoload_real.php b/apps/files_versions/composer/composer/autoload_real.php
index 8479a1f199b..8ef47ad2b76 100644
--- a/apps/files_versions/composer/composer/autoload_real.php
+++ b/apps/files_versions/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitFiles_Versions
call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Versions::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;
diff --git a/apps/lookup_server_connector/composer/composer.json b/apps/lookup_server_connector/composer/composer.json
index 5ff3be7e18b..78a76b2d1e1 100644
--- a/apps/lookup_server_connector/composer/composer.json
+++ b/apps/lookup_server_connector/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "LookupServerConnector"
},
"autoload" : {
diff --git a/apps/lookup_server_connector/composer/composer/autoload_real.php b/apps/lookup_server_connector/composer/composer/autoload_real.php
index 92627f9dfaa..a19405c7127 100644
--- a/apps/lookup_server_connector/composer/composer/autoload_real.php
+++ b/apps/lookup_server_connector/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitLookupServerConnector
call_user_func(\Composer\Autoload\ComposerStaticInitLookupServerConnector::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;
diff --git a/apps/oauth2/composer/composer.json b/apps/oauth2/composer/composer.json
index 95fe2e1604e..78f235f3c2e 100644
--- a/apps/oauth2/composer/composer.json
+++ b/apps/oauth2/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "OAuth2"
},
"autoload" : {
diff --git a/apps/oauth2/composer/composer/autoload_real.php b/apps/oauth2/composer/composer/autoload_real.php
index 855ff3261b3..111841c0f83 100644
--- a/apps/oauth2/composer/composer/autoload_real.php
+++ b/apps/oauth2/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitOAuth2
call_user_func(\Composer\Autoload\ComposerStaticInitOAuth2::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;
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;
diff --git a/apps/sharebymail/composer/composer.json b/apps/sharebymail/composer/composer.json
index 3e7359c114a..160930a37ad 100644
--- a/apps/sharebymail/composer/composer.json
+++ b/apps/sharebymail/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "ShareByMail"
},
"autoload" : {
diff --git a/apps/sharebymail/composer/composer/autoload_real.php b/apps/sharebymail/composer/composer/autoload_real.php
index b03d256defe..9149cbd9155 100644
--- a/apps/sharebymail/composer/composer/autoload_real.php
+++ b/apps/sharebymail/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitShareByMail
call_user_func(\Composer\Autoload\ComposerStaticInitShareByMail::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;
diff --git a/apps/systemtags/composer/composer.json b/apps/systemtags/composer/composer.json
index 06b4e7f1df4..1c2bdf004ee 100644
--- a/apps/systemtags/composer/composer.json
+++ b/apps/systemtags/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "SystemTags"
},
"autoload" : {
diff --git a/apps/systemtags/composer/composer/autoload_real.php b/apps/systemtags/composer/composer/autoload_real.php
index a085cdeb46d..dcd4bd99c31 100644
--- a/apps/systemtags/composer/composer/autoload_real.php
+++ b/apps/systemtags/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitSystemTags
call_user_func(\Composer\Autoload\ComposerStaticInitSystemTags::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;
diff --git a/apps/testing/composer/composer.json b/apps/testing/composer/composer.json
index 4cee66ac094..769aaf70fd7 100644
--- a/apps/testing/composer/composer.json
+++ b/apps/testing/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "Testing"
},
"autoload" : {
diff --git a/apps/testing/composer/composer/autoload_real.php b/apps/testing/composer/composer/autoload_real.php
index 71369dc8a05..611d8e41c95 100644
--- a/apps/testing/composer/composer/autoload_real.php
+++ b/apps/testing/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitTesting
call_user_func(\Composer\Autoload\ComposerStaticInitTesting::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;
diff --git a/apps/twofactor_backupcodes/composer/composer.json b/apps/twofactor_backupcodes/composer/composer.json
index ef521965208..bfa807a8e4f 100644
--- a/apps/twofactor_backupcodes/composer/composer.json
+++ b/apps/twofactor_backupcodes/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "TwoFactorBackupCodes"
},
"autoload" : {
diff --git a/apps/twofactor_backupcodes/composer/composer/autoload_real.php b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
index 435d883ffa0..9e6baad706d 100644
--- a/apps/twofactor_backupcodes/composer/composer/autoload_real.php
+++ b/apps/twofactor_backupcodes/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitTwoFactorBackupCodes
call_user_func(\Composer\Autoload\ComposerStaticInitTwoFactorBackupCodes::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;
diff --git a/apps/updatenotification/composer/composer.json b/apps/updatenotification/composer/composer.json
index 3e14337eb69..1357d3f09b8 100644
--- a/apps/updatenotification/composer/composer.json
+++ b/apps/updatenotification/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "UpdateNotification"
},
"autoload" : {
diff --git a/apps/updatenotification/composer/composer/autoload_real.php b/apps/updatenotification/composer/composer/autoload_real.php
index 41580edbf38..263bae93867 100644
--- a/apps/updatenotification/composer/composer/autoload_real.php
+++ b/apps/updatenotification/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitUpdateNotification
call_user_func(\Composer\Autoload\ComposerStaticInitUpdateNotification::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;
diff --git a/apps/user_ldap/composer/composer.json b/apps/user_ldap/composer/composer.json
index 0af0b6bea39..476e31250f6 100644
--- a/apps/user_ldap/composer/composer.json
+++ b/apps/user_ldap/composer/composer.json
@@ -2,7 +2,7 @@
"config" : {
"vendor-dir": ".",
"optimize-autoloader": true,
- "authorative-autoloader": true,
+ "classmap-authoritative": true,
"autoloader-suffix": "User_LDAP"
},
"autoload" : {
diff --git a/apps/user_ldap/composer/composer/autoload_real.php b/apps/user_ldap/composer/composer/autoload_real.php
index ab7adf2412f..94d3383da77 100644
--- a/apps/user_ldap/composer/composer/autoload_real.php
+++ b/apps/user_ldap/composer/composer/autoload_real.php
@@ -29,22 +29,13 @@ class ComposerAutoloaderInitUser_LDAP
call_user_func(\Composer\Autoload\ComposerStaticInitUser_LDAP::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;
--
GitLab