mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #20265 from nextcloud/techdebt/legacy-classes-psr4 

Move legacy classes from PSR0 to PSR4
This commit is contained in:
Roeland Jago Douma 2020-04-07 09:57:16 +02:00 committed by GitHub
parent 9895aff4d9 1e086064f5
commit 50ad706a33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -4,10 +4,8 @@
"optimize-autoloader": true
},
"autoload" : {
"psr-0": {
"": "lib/private/legacy"
},
"psr-4": {
"": "lib/private/legacy",
"OC\\": "lib/private",
"OC\\Core\\": "core/",
"OCP\\": "lib/public"

32
lib/composer/composer/autoload_classmap.php
View File

@ -1292,20 +1292,20 @@ return array(
'OC\\User\\NoUserException' => $baseDir . '/lib/private/User/NoUserException.php',
'OC\\User\\Session' => $baseDir . '/lib/private/User/Session.php',
'OC\\User\\User' => $baseDir . '/lib/private/User/User.php',
'OC_API' => $baseDir . '/lib/private/legacy/api.php',
'OC_App' => $baseDir . '/lib/private/legacy/app.php',
'OC_DB' => $baseDir . '/lib/private/legacy/db.php',
'OC_DB_StatementWrapper' => $baseDir . '/lib/private/legacy/db/statementwrapper.php',
'OC_Defaults' => $baseDir . '/lib/private/legacy/defaults.php',
'OC_EventSource' => $baseDir . '/lib/private/legacy/eventsource.php',
'OC_FileChunking' => $baseDir . '/lib/private/legacy/filechunking.php',
'OC_Files' => $baseDir . '/lib/private/legacy/files.php',
'OC_Helper' => $baseDir . '/lib/private/legacy/helper.php',
'OC_Hook' => $baseDir . '/lib/private/legacy/hook.php',
'OC_Image' => $baseDir . '/lib/private/legacy/image.php',
'OC_JSON' => $baseDir . '/lib/private/legacy/json.php',
'OC_Response' => $baseDir . '/lib/private/legacy/response.php',
'OC_Template' => $baseDir . '/lib/private/legacy/template.php',
'OC_User' => $baseDir . '/lib/private/legacy/user.php',
'OC_Util' => $baseDir . '/lib/private/legacy/util.php',
'OC_API' => $baseDir . '/lib/private/legacy/OC_API.php',
'OC_App' => $baseDir . '/lib/private/legacy/OC_App.php',
'OC_DB' => $baseDir . '/lib/private/legacy/OC_DB.php',
'OC_DB_StatementWrapper' => $baseDir . '/lib/private/legacy/OC_DB_StatementWrapper.php',
'OC_Defaults' => $baseDir . '/lib/private/legacy/OC_Defaults.php',
'OC_EventSource' => $baseDir . '/lib/private/legacy/OC_EventSource.php',
'OC_FileChunking' => $baseDir . '/lib/private/legacy/OC_FileChunking.php',
'OC_Files' => $baseDir . '/lib/private/legacy/OC_Files.php',
'OC_Helper' => $baseDir . '/lib/private/legacy/OC_Helper.php',
'OC_Hook' => $baseDir . '/lib/private/legacy/OC_Hook.php',
'OC_Image' => $baseDir . '/lib/private/legacy/OC_Image.php',
'OC_JSON' => $baseDir . '/lib/private/legacy/OC_JSON.php',
'OC_Response' => $baseDir . '/lib/private/legacy/OC_Response.php',
'OC_Template' => $baseDir . '/lib/private/legacy/OC_Template.php',
'OC_User' => $baseDir . '/lib/private/legacy/OC_User.php',
'OC_Util' => $baseDir . '/lib/private/legacy/OC_Util.php',
);

1
lib/composer/composer/autoload_namespaces.php
View File

@ -6,5 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir));
return array(
'' => array($baseDir . '/lib/private/legacy'),
);

1
lib/composer/composer/autoload_psr4.php
View File

@ -9,4 +9,5 @@ return array(
'OC\\Core\\' => array($baseDir . '/core'),
'OC\\' => array($baseDir . '/lib/private'),
'OCP\\' => array($baseDir . '/lib/public'),
'' => array($baseDir . '/lib/private/legacy'),
);

36
lib/composer/composer/autoload_static.php
View File

@ -30,7 +30,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
),
);
public static $fallbackDirsPsr0 = array (
public static $fallbackDirsPsr4 = array (
0 => __DIR__ . '/../../..' . '/lib/private/legacy',
);
@ -1321,22 +1321,22 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\User\\NoUserException' => __DIR__ . '/../../..' . '/lib/private/User/NoUserException.php',
'OC\\User\\Session' => __DIR__ . '/../../..' . '/lib/private/User/Session.php',
'OC\\User\\User' => __DIR__ . '/../../..' . '/lib/private/User/User.php',
'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/api.php',
'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/app.php',
'OC_DB' => __DIR__ . '/../../..' . '/lib/private/legacy/db.php',
'OC_DB_StatementWrapper' => __DIR__ . '/../../..' . '/lib/private/legacy/db/statementwrapper.php',
'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/defaults.php',
'OC_EventSource' => __DIR__ . '/../../..' . '/lib/private/legacy/eventsource.php',
'OC_FileChunking' => __DIR__ . '/../../..' . '/lib/private/legacy/filechunking.php',
'OC_Files' => __DIR__ . '/../../..' . '/lib/private/legacy/files.php',
'OC_Helper' => __DIR__ . '/../../..' . '/lib/private/legacy/helper.php',
'OC_Hook' => __DIR__ . '/../../..' . '/lib/private/legacy/hook.php',
'OC_Image' => __DIR__ . '/../../..' . '/lib/private/legacy/image.php',
'OC_JSON' => __DIR__ . '/../../..' . '/lib/private/legacy/json.php',
'OC_Response' => __DIR__ . '/../../..' . '/lib/private/legacy/response.php',
'OC_Template' => __DIR__ . '/../../..' . '/lib/private/legacy/template.php',
'OC_User' => __DIR__ . '/../../..' . '/lib/private/legacy/user.php',
'OC_Util' => __DIR__ . '/../../..' . '/lib/private/legacy/util.php',
'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_API.php',
'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_App.php',
'OC_DB' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB.php',
'OC_DB_StatementWrapper' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_DB_StatementWrapper.php',
'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Defaults.php',
'OC_EventSource' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_EventSource.php',
'OC_FileChunking' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_FileChunking.php',
'OC_Files' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Files.php',
'OC_Helper' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Helper.php',
'OC_Hook' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Hook.php',
'OC_Image' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Image.php',
'OC_JSON' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_JSON.php',
'OC_Response' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Response.php',
'OC_Template' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Template.php',
'OC_User' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_User.php',
'OC_Util' => __DIR__ . '/../../..' . '/lib/private/legacy/OC_Util.php',
);
public static function getInitializer(ClassLoader $loader)
@ -1344,7 +1344,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$prefixDirsPsr4;
$loader->fallbackDirsPsr0 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$fallbackDirsPsr0;
$loader->fallbackDirsPsr4 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$fallbackDirsPsr4;
$loader->classMap = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$classMap;
}, null, ClassLoader::class);

0
lib/private/legacy/api.php → lib/private/legacy/OC_API.php
View File

0
lib/private/legacy/app.php → lib/private/legacy/OC_App.php
View File

0
lib/private/legacy/db.php → lib/private/legacy/OC_DB.php
View File

0
lib/private/legacy/db/statementwrapper.php → lib/private/legacy/OC_DB_StatementWrapper.php
View File

0
lib/private/legacy/defaults.php → lib/private/legacy/OC_Defaults.php
View File

0
lib/private/legacy/eventsource.php → lib/private/legacy/OC_EventSource.php
View File

0
lib/private/legacy/filechunking.php → lib/private/legacy/OC_FileChunking.php
View File

0
lib/private/legacy/files.php → lib/private/legacy/OC_Files.php
View File

0
lib/private/legacy/helper.php → lib/private/legacy/OC_Helper.php
View File

0
lib/private/legacy/hook.php → lib/private/legacy/OC_Hook.php
View File

0
lib/private/legacy/image.php → lib/private/legacy/OC_Image.php
View File

0
lib/private/legacy/json.php → lib/private/legacy/OC_JSON.php
View File

0
lib/private/legacy/response.php → lib/private/legacy/OC_Response.php
View File

0
lib/private/legacy/template.php → lib/private/legacy/OC_Template.php
View File

0
lib/private/legacy/user.php → lib/private/legacy/OC_User.php
View File

0
lib/private/legacy/util.php → lib/private/legacy/OC_Util.php
View File

3
tests/lib/TemplateFunctionsTest.php
View File

@ -27,8 +27,7 @@ class TemplateFunctionsTest extends \Test\TestCase {
protected function setUp(): void {
parent::setUp();
$loader = new \OC\Autoloader([\OC::$SERVERROOT . '/lib']);
$loader->load('OC_Template');
require_once \OC::$SERVERROOT . '/lib/private/legacy/OC_Template.php';
}
public function testPJavaScript() {