Merge branch 'master' into autocomplete-gui

4 files changed, 11 insertions, 10 deletions

diff --git a/apps/files_sharing/composer/autoload.php b/apps/files_sharing/composer/autoload.php
index 3b046bff7f4..0aa77c00af9 100644
--- a/apps/files_sharing/composer/autoload.php
+++ b/apps/files_sharing/composer/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitf32f03f7cd82bff20d6a51be16689441::getLoader();
+return ComposerAutoloaderInitFiles_Sharing::getLoader();
diff --git a/apps/files_sharing/composer/composer.json b/apps/files_sharing/composer/composer.json
index 4d2aae1d6e1..d500819ff82 100644
--- a/apps/files_sharing/composer/composer.json
+++ b/apps/files_sharing/composer/composer.json
@@ -2,7 +2,8 @@
     "config" : {
         "vendor-dir": ".",
         "optimize-autoloader": true,
-        "authorative-autoloader": true
+        "authorative-autoloader": true,
+        "autoloader-suffix": "Files_Sharing"
     },
     "autoload" : {
         "psr-4": {
diff --git a/apps/files_sharing/composer/composer/autoload_real.php b/apps/files_sharing/composer/composer/autoload_real.php
index fc2e3dcfcb0..504c701247f 100644
--- a/apps/files_sharing/composer/composer/autoload_real.php
+++ b/apps/files_sharing/composer/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitf32f03f7cd82bff20d6a51be16689441
+class ComposerAutoloaderInitFiles_Sharing
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitf32f03f7cd82bff20d6a51be16689441
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitf32f03f7cd82bff20d6a51be16689441', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitFiles_Sharing', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitf32f03f7cd82bff20d6a51be16689441', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitFiles_Sharing', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitf32f03f7cd82bff20d6a51be16689441::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Sharing::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
diff --git a/apps/files_sharing/composer/composer/autoload_static.php b/apps/files_sharing/composer/composer/autoload_static.php
index 311dd9a702e..328d6aca01d 100644
--- a/apps/files_sharing/composer/composer/autoload_static.php
+++ b/apps/files_sharing/composer/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitf32f03f7cd82bff20d6a51be16689441
+class ComposerStaticInitFiles_Sharing
 {
     public static $prefixLengthsPsr4 = array (
         'O' => 
@@ -74,9 +74,9 @@ class ComposerStaticInitf32f03f7cd82bff20d6a51be16689441
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitf32f03f7cd82bff20d6a51be16689441::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitf32f03f7cd82bff20d6a51be16689441::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitf32f03f7cd82bff20d6a51be16689441::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Sharing::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitFiles_Sharing::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitFiles_Sharing::$classMap;
 
         }, null, ClassLoader::class);
     }