From 1e086064f5b7ebf2d00d024874a1ecf4cf9d13b5 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Wed, 1 Apr 2020 20:44:29 +0200
Subject: [PATCH] Move legacy classes from PSR0 to PSR4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
composer.json | 6 ++--
lib/composer/composer/autoload_classmap.php | 32 ++++++++---------
lib/composer/composer/autoload_namespaces.php | 1 -
lib/composer/composer/autoload_psr4.php | 1 +
lib/composer/composer/autoload_static.php | 36 +++++++++----------
lib/private/legacy/{api.php => OC_API.php} | 0
lib/private/legacy/{app.php => OC_App.php} | 0
lib/private/legacy/{db.php => OC_DB.php} | 0
...wrapper.php => OC_DB_StatementWrapper.php} | 0
.../legacy/{defaults.php => OC_Defaults.php} | 0
.../{eventsource.php => OC_EventSource.php} | 0
.../{filechunking.php => OC_FileChunking.php} | 0
.../legacy/{files.php => OC_Files.php} | 0
.../legacy/{helper.php => OC_Helper.php} | 0
lib/private/legacy/{hook.php => OC_Hook.php} | 0
.../legacy/{image.php => OC_Image.php} | 0
lib/private/legacy/{json.php => OC_JSON.php} | 0
.../legacy/{response.php => OC_Response.php} | 0
.../legacy/{template.php => OC_Template.php} | 0
lib/private/legacy/{user.php => OC_User.php} | 0
lib/private/legacy/{util.php => OC_Util.php} | 0
tests/lib/TemplateFunctionsTest.php | 3 +-
22 files changed, 38 insertions(+), 41 deletions(-)
rename lib/private/legacy/{api.php => OC_API.php} (100%)
rename lib/private/legacy/{app.php => OC_App.php} (100%)
rename lib/private/legacy/{db.php => OC_DB.php} (100%)
rename lib/private/legacy/{db/statementwrapper.php => OC_DB_StatementWrapper.php} (100%)
rename lib/private/legacy/{defaults.php => OC_Defaults.php} (100%)
rename lib/private/legacy/{eventsource.php => OC_EventSource.php} (100%)
rename lib/private/legacy/{filechunking.php => OC_FileChunking.php} (100%)
rename lib/private/legacy/{files.php => OC_Files.php} (100%)
rename lib/private/legacy/{helper.php => OC_Helper.php} (100%)
rename lib/private/legacy/{hook.php => OC_Hook.php} (100%)
rename lib/private/legacy/{image.php => OC_Image.php} (100%)
rename lib/private/legacy/{json.php => OC_JSON.php} (100%)
rename lib/private/legacy/{response.php => OC_Response.php} (100%)
rename lib/private/legacy/{template.php => OC_Template.php} (100%)
rename lib/private/legacy/{user.php => OC_User.php} (100%)
rename lib/private/legacy/{util.php => OC_Util.php} (100%)
diff --git a/composer.json b/composer.json
index ea99a098557..fae1c7a221d 100644
--- a/composer.json
+++ b/composer.json
@@ -4,10 +4,8 @@
"optimize-autoloader": true
},
"autoload" : {
- "psr-0": {
- "": "lib/private/legacy"
- },
- "psr-4": {
+ "psr-4": {
+ "": "lib/private/legacy",
"OC\\": "lib/private",
"OC\\Core\\": "core/",
"OCP\\": "lib/public"
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 8954b883e3b..e4306ca0369 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -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',
);
diff --git a/lib/composer/composer/autoload_namespaces.php b/lib/composer/composer/autoload_namespaces.php
index ca3a13a84f6..4a9c20beed0 100644
--- a/lib/composer/composer/autoload_namespaces.php
+++ b/lib/composer/composer/autoload_namespaces.php
@@ -6,5 +6,4 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname(dirname($vendorDir));
return array(
- '' => array($baseDir . '/lib/private/legacy'),
);
diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php
index 31c762759e3..b641d9c6a03 100644
--- a/lib/composer/composer/autoload_psr4.php
+++ b/lib/composer/composer/autoload_psr4.php
@@ -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'),
);
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 136562ff75c..abc4a40fd75 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -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);
diff --git a/lib/private/legacy/api.php b/lib/private/legacy/OC_API.php
similarity index 100%
rename from lib/private/legacy/api.php
rename to lib/private/legacy/OC_API.php
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/OC_App.php
similarity index 100%
rename from lib/private/legacy/app.php
rename to lib/private/legacy/OC_App.php
diff --git a/lib/private/legacy/db.php b/lib/private/legacy/OC_DB.php
similarity index 100%
rename from lib/private/legacy/db.php
rename to lib/private/legacy/OC_DB.php
diff --git a/lib/private/legacy/db/statementwrapper.php b/lib/private/legacy/OC_DB_StatementWrapper.php
similarity index 100%
rename from lib/private/legacy/db/statementwrapper.php
rename to lib/private/legacy/OC_DB_StatementWrapper.php
diff --git a/lib/private/legacy/defaults.php b/lib/private/legacy/OC_Defaults.php
similarity index 100%
rename from lib/private/legacy/defaults.php
rename to lib/private/legacy/OC_Defaults.php
diff --git a/lib/private/legacy/eventsource.php b/lib/private/legacy/OC_EventSource.php
similarity index 100%
rename from lib/private/legacy/eventsource.php
rename to lib/private/legacy/OC_EventSource.php
diff --git a/lib/private/legacy/filechunking.php b/lib/private/legacy/OC_FileChunking.php
similarity index 100%
rename from lib/private/legacy/filechunking.php
rename to lib/private/legacy/OC_FileChunking.php
diff --git a/lib/private/legacy/files.php b/lib/private/legacy/OC_Files.php
similarity index 100%
rename from lib/private/legacy/files.php
rename to lib/private/legacy/OC_Files.php
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/OC_Helper.php
similarity index 100%
rename from lib/private/legacy/helper.php
rename to lib/private/legacy/OC_Helper.php
diff --git a/lib/private/legacy/hook.php b/lib/private/legacy/OC_Hook.php
similarity index 100%
rename from lib/private/legacy/hook.php
rename to lib/private/legacy/OC_Hook.php
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/OC_Image.php
similarity index 100%
rename from lib/private/legacy/image.php
rename to lib/private/legacy/OC_Image.php
diff --git a/lib/private/legacy/json.php b/lib/private/legacy/OC_JSON.php
similarity index 100%
rename from lib/private/legacy/json.php
rename to lib/private/legacy/OC_JSON.php
diff --git a/lib/private/legacy/response.php b/lib/private/legacy/OC_Response.php
similarity index 100%
rename from lib/private/legacy/response.php
rename to lib/private/legacy/OC_Response.php
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/OC_Template.php
similarity index 100%
rename from lib/private/legacy/template.php
rename to lib/private/legacy/OC_Template.php
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/OC_User.php
similarity index 100%
rename from lib/private/legacy/user.php
rename to lib/private/legacy/OC_User.php
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/OC_Util.php
similarity index 100%
rename from lib/private/legacy/util.php
rename to lib/private/legacy/OC_Util.php
diff --git a/tests/lib/TemplateFunctionsTest.php b/tests/lib/TemplateFunctionsTest.php
index ac73873ce37..a6385670487 100644
--- a/tests/lib/TemplateFunctionsTest.php
+++ b/tests/lib/TemplateFunctionsTest.php
@@ -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() {
--
GitLab